Skip to content

Commit 155e070

Browse files
committed
Add Uri\Rfc3986\Uri class to ext/uri
Relates to #14461 and https://wiki.php.net/rfc/url_parsing_api
1 parent 3399235 commit 155e070

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1899
-132
lines changed

Zend/zend_string.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,7 @@ EMPTY_SWITCH_DEFAULT_CASE()
596596
_(ZEND_STR_SCHEME, "scheme") \
597597
_(ZEND_STR_HOST, "host") \
598598
_(ZEND_STR_PORT, "port") \
599+
_(ZEND_STR_USERINFO, "userinfo") \
599600
_(ZEND_STR_USER, "user") \
600601
_(ZEND_STR_USERNAME, "username") \
601602
_(ZEND_STR_PASS, "pass") \

build/gen_stub.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3055,6 +3055,7 @@ class PropertyInfo extends VariableLike
30553055
private const PHP_85_KNOWN = [
30563056
"self" => "ZEND_STR_SELF",
30573057
"parent" => "ZEND_STR_PARENT",
3058+
"userinfo" => "ZEND_STR_USERINFO",
30583059
"username" => "ZEND_STR_USERNAME",
30593060
"password" => "ZEND_STR_PASSWORD",
30603061
];

ext/uri/config.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PHP_INSTALL_HEADERS([ext/uri], m4_normalize([
55
php_lexbor.h
66
php_uri.h
77
php_uri_common.h
8+
php_uriparser.h
89
]))
910

1011
AC_DEFINE([URI_ENABLE_ANSI], [1], [Define to 1 for enabling ANSI support of uriparser.])
@@ -17,6 +18,6 @@ $URIPARSER_DIR/src/UriMemory.c $URIPARSER_DIR/src/UriNormalize.c $URIPARSER_DIR/
1718
$URIPARSER_DIR/src/UriParse.c $URIPARSER_DIR/src/UriParseBase.c $URIPARSER_DIR/src/UriQuery.c \
1819
$URIPARSER_DIR/src/UriRecompose.c $URIPARSER_DIR/src/UriResolve.c $URIPARSER_DIR/src/UriShorten.c"
1920

20-
PHP_NEW_EXTENSION(uri, [php_lexbor.c php_uri.c php_uri_common.c $URIPARSER_SOURCES], [no],,[-I$ext_srcdir/$URIPARSER_DIR/include -DURI_STATIC_BUILD -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
21+
PHP_NEW_EXTENSION(uri, [php_lexbor.c php_uri.c php_uri_common.c php_uriparser.c $URIPARSER_SOURCES], [no],,[-I$ext_srcdir/$URIPARSER_DIR/include -DURI_STATIC_BUILD -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
2122
PHP_ADD_EXTENSION_DEP(uri, lexbor)
2223
PHP_ADD_BUILD_DIR($ext_builddir/$URIPARSER_DIR/src $ext_builddir/$URIPARSER_DIR/include)

0 commit comments

Comments
 (0)