Update uriparser

Author: kocsismate

ext/uri/config.m4

@@ -18,10 +18,10 @@ $URIPARSER_DIR/src/UriEscape.c $URIPARSER_DIR/src/UriFile.c $URIPARSER_DIR/src/U
 $URIPARSER_DIR/src/UriMemory.c $URIPARSER_DIR/src/UriNormalize.c $URIPARSER_DIR/src/UriNormalizeBase.c \
 $URIPARSER_DIR/src/UriParse.c $URIPARSER_DIR/src/UriParseBase.c $URIPARSER_DIR/src/UriQuery.c \
 $URIPARSER_DIR/src/UriRecompose.c $URIPARSER_DIR/src/UriResolve.c $URIPARSER_DIR/src/UriSetFragment.c \
-$URIPARSER_DIR/src/UriSetHostCommon.c $URIPARSER_DIR/src/UriSetHostIp4.c $URIPARSER_DIR/src/UriSetHostIp6.c \
-$URIPARSER_DIR/src/UriSetHostIpFuture.c $URIPARSER_DIR/src/UriSetHostRegName.c $URIPARSER_DIR/src/UriSetPath.c \
-$URIPARSER_DIR/src/UriSetPort.c $URIPARSER_DIR/src/UriSetQuery.c $URIPARSER_DIR/src/UriSetScheme.c \
-$URIPARSER_DIR/src/UriSetUserInfo.c $URIPARSER_DIR/src/UriShorten.c"
+$URIPARSER_DIR/src/UriSetHostAuto.c $URIPARSER_DIR/src/UriSetHostCommon.c $URIPARSER_DIR/src/UriSetHostIp4.c \
+$URIPARSER_DIR/src/UriSetHostIp6.c $URIPARSER_DIR/src/UriSetHostIpFuture.c $URIPARSER_DIR/src/UriSetHostRegName.c \
+$URIPARSER_DIR/src/UriSetPath.c $URIPARSER_DIR/src/UriSetPort.c $URIPARSER_DIR/src/UriSetQuery.c \
+$URIPARSER_DIR/src/UriSetScheme.c $URIPARSER_DIR/src/UriSetUserInfo.c $URIPARSER_DIR/src/UriShorten.c"
 
 PHP_NEW_EXTENSION(uri, [php_uri.c php_uri_common.c uri_parser_rfc3986.c uri_parser_whatwg.c uri_parser_php_parse_url.c $URIPARSER_SOURCES], [no],,[-I$ext_srcdir/$URIPARSER_DIR/include -DURI_STATIC_BUILD -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 PHP_ADD_EXTENSION_DEP(uri, lexbor)

ext/uri/config.w32

@@ -7,6 +7,6 @@ ADD_FLAG("CFLAGS_URI", "/D URI_STATIC_BUILD");
 ADD_EXTENSION_DEP('uri', 'lexbor');
 ADD_SOURCES("ext/uri/uriparser/src", "UriCommon.c UriCompare.c UriCopy.c UriEscape.c UriFile.c UriIp4.c UriIp4Base.c \
     UriMemory.c UriNormalize.c UriNormalizeBase.c UriParse.c UriParseBase.c UriQuery.c UriRecompose.c UriResolve.c \
-    UriSetFragment.c UriSetHostCommon.c UriSetHostIp4.c UriSetHostIp6.c UriSetHostIpFuture.c UriSetHostRegName.c \
+    UriSetFragment.c UriSetHostAuto.c UriSetHostCommon.c UriSetHostIp4.c UriSetHostIp6.c UriSetHostIpFuture.c UriSetHostRegName.c \
     UriSetPath.c UriSetPort.c UriSetQuery.c UriSetScheme.c UriSetUserInfo.c UriShorten.c", "uri");
 PHP_INSTALL_HEADERS("ext/uri", "php_uri.h php_uri_common.h uri_parser_rfc3986.h uri_parser_whatwg.h uri_parser_php_parse_url.h uriparser/src uriparser/include");

ext/uri/tests/026.phpt

@@ -9,12 +9,16 @@ $uri1 = Uri\Rfc3986\Uri::parse("https://example.com");
 $uri2 = $uri1->withHost("test.com");
 $uri3 = $uri2->withHost("t%65st.com"); // test.com
 $uri4 = $uri3->withHost(null);
+$uri5 = $uri4->withHost("192.168.0.1");
+$uri6 = $uri5->withHost("[2001:db8:3333:4444:5555:6666:7777:8888]");
 
 var_dump($uri1->getHost());
 var_dump($uri2->getHost());
 var_dump($uri3->getHost());
 var_dump($uri3->getRawHost());
 var_dump($uri4->getRawHost());
+var_dump($uri5->getRawHost());
+var_dump($uri6->getRawHost());
 
 try {
     $uri3->withHost("test.com:8080");
@@ -55,10 +59,14 @@ try {
 $url1 = Uri\WhatWg\Url::parse("https://example.com");
 $url2 = $url1->withHost("test.com");
 $url3 = $url2->withHost("t%65st.com"); // test.com
+$url4 = $url3->withHost("192.168.0.1");
+$url5 = $url4->withHost("[2001:db8:3333:4444:5555:6666:7777:8888]");
 
 var_dump($url1->getAsciiHost());
 var_dump($url2->getAsciiHost());
 var_dump($url3->getAsciiHost());
+var_dump($url4->getAsciiHost());
+var_dump($url5->getAsciiHost());
 
 try {
     $url3->withHost("test.com:8080");
@@ -97,6 +105,8 @@ string(8) "test.com"
 string(8) "test.com"
 string(10) "t%65st.com"
 NULL
+string(11) "192.168.0.1"
+string(40) "[2001:db8:3333:4444:5555:6666:7777:8888]"
 The specified host is malformed
 The specified host is malformed
 string(7) "foo.com"
@@ -105,6 +115,8 @@ The specified host is malformed
 string(11) "example.com"
 string(8) "test.com"
 string(8) "test.com"
+string(11) "192.168.0.1"
+string(40) "[2001:db8:3333:4444:5555:6666:7777:8888]"
 The specified host is malformed
 The specified host is malformed (DomainInvalidCodePoint)
 The specified host is malformed

ext/uri/tests/035.phpt

@@ -11,6 +11,13 @@ try {
     echo $e->getMessage() . "\n";
 }
 
+$uri = new Uri\Rfc3986\Uri("https://example.com");
+try {
+    $uri->withHost("exam\0ple.com");
+} catch (Error $e) {
+    echo $e->getMessage() . "\n";
+}
+
 try {
     new Uri\WhatWg\Url("https://exam\0ple.com");
 } catch (Error $e) {
@@ -27,5 +34,6 @@ try {
 ?>
 --EXPECT--
 Uri\Rfc3986\Uri::__construct(): Argument #1 ($uri) must not contain any null bytes
+Uri\Rfc3986\Uri::withHost(): Argument #1 ($host) must not contain any null bytes
 Uri\WhatWg\Url::__construct(): Argument #1 ($uri) must not contain any null bytes
 Uri\WhatWg\Url::withHost(): Argument #1 ($host) must not contain any null bytes

ext/uri/uri_parser_rfc3986.c

@@ -253,9 +253,9 @@ static zend_result php_uri_parser_rfc3986_host_write(struct uri_internal_t *inte
 	int result;
 
 	if (Z_TYPE_P(value) == IS_NULL) {
-		result = uriSetHostRegNameMmA(uriparser_uri, NULL, NULL, mm);
+		result = uriSetHostAutoMmA(uriparser_uri, NULL, NULL, mm);
 	} else {
-		result = uriSetHostRegNameMmA(uriparser_uri, Z_STRVAL_P(value), Z_STRVAL_P(value) + Z_STRLEN_P(value), mm);
+		result = uriSetHostAutoMmA(uriparser_uri, Z_STRVAL_P(value), Z_STRVAL_P(value) + Z_STRLEN_P(value), mm);
 	}
 
 	if (result != URI_SUCCESS) {