Update uriparser + verify behavior

Author: kocsismate

ext/uri/tests/026_userinfo.phpt

@@ -16,6 +16,10 @@ var_dump($uri3->getUserInfo());
 var_dump($uri4->getUserInfo());
 var_dump($uri4->getRawUserInfo());
 
+$uri1 = Uri\Rfc3986\Uri::parse("/foo");
+$uri2 = $uri1->withUserInfo(null);
+var_dump($uri2->getPort());
+
 try {
     $uri4->withUserInfo("u:s/r");
 } catch (Uri\InvalidUriException $e) {
@@ -35,6 +39,7 @@ string(4) "user"
 NULL
 string(11) "us%2Fr:pass"
 string(13) "%75s%2Fr:pass"
+NULL
 The specified userinfo is malformed
 NULL
 string(9) "user:pass"

ext/uri/tests/027.phpt

@@ -26,12 +26,8 @@ var_dump($uri1->getPort());
 var_dump($uri2->getPort());
 
 $uri1 = Uri\Rfc3986\Uri::parse("/foo");
-
-try {
-    $uri1->withPort(null); // TODO should not throw
-} catch (Uri\InvalidUriException $e) {
-    echo $e->getMessage() . "\n";
-}
+$uri2 = $uri1->withPort(null);
+var_dump($uri2->getPort());
 
 try {
     $uri1->withPort(1);
@@ -68,7 +64,7 @@ int(443)
 int(8080)
 NULL
 int(80)
-The specified port is malformed
+NULL
 The specified port is malformed
 int(8080)
 int(22)

ext/uri/uriparser/src/UriSetPort.c

@@ -120,7 +120,7 @@ int URI_FUNC(SetPortTextMm)(URI_TYPE(Uri) * uri,
 	/* The RFC 3986 grammar reads:
 	 *   authority = [ userinfo "@" ] host [ ":" port ]
 	 * So no port without a host. */
-	if (URI_FUNC(HasHost)(uri) == URI_FALSE) {
+	if ((first != NULL) && (URI_FUNC(HasHost)(uri) == URI_FALSE)) {
 		return URI_ERROR_SETPORT_HOST_NOT_SET;
 	}
 

ext/uri/uriparser/src/UriSetUserInfo.c

@@ -247,7 +247,7 @@ int URI_FUNC(SetUserInfoMm)(URI_TYPE(Uri) * uri,
 	/* The RFC 3986 grammar reads:
 	 *   authority = [ userinfo "@" ] host [ ":" port ]
 	 * So no user info without a host. */
-	if (URI_FUNC(HasHost)(uri) == URI_FALSE) {
+	if ((first != NULL) && (URI_FUNC(HasHost)(uri) == URI_FALSE)) {
 		return URI_ERROR_SETUSERINFO_HOST_NOT_SET;
 	}