Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80114: parse_url does not accept URLs with port 0

Author: cmb69

NEWS

@@ -15,6 +15,9 @@ PHP                                                                        NEWS
 - PCRE:
   . Updated to PCRE 10.35. (cmb)
 
+- Standard:
+  . Fixed bug #80114 (parse_url does not accept URLs with port 0). (cmb, twosee)
+
 01 Oct 2020, PHP 7.4.11
 
 - Core:

ext/standard/tests/url/parse_url_basic_001.phpt

@@ -859,6 +859,15 @@ echo "Done";
   string(3) "%:x"
 }
 
+--> https://example.com:0/: array(3) {
+  ["scheme"]=>
+  string(5) "https"
+  ["host"]=>
+  string(11) "example.com"
+  ["path"]=>
+  string(1) "/"
+}
+
 --> http:///blah.com: bool(false)
 
 --> http://:80: bool(false)

ext/standard/tests/url/parse_url_basic_002.phpt

@@ -113,6 +113,7 @@ echo "Done";
 --> /   : NULL
 --> /rest/Users?filter={"id":"123"}   : NULL
 --> %:x   : NULL
+--> https://example.com:0/   : string(5) "https"
 --> http:///blah.com   : bool(false)
 --> http://:80   : bool(false)
 --> http://user@:80   : bool(false)

ext/standard/tests/url/parse_url_basic_003.phpt

@@ -112,6 +112,7 @@ echo "Done";
 --> /   : NULL
 --> /rest/Users?filter={"id":"123"}   : NULL
 --> %:x   : NULL
+--> https://example.com:0/   : string(11) "example.com"
 --> http:///blah.com   : bool(false)
 --> http://:80   : bool(false)
 --> http://user@:80   : bool(false)

ext/standard/tests/url/parse_url_basic_004.phpt

@@ -112,6 +112,7 @@ echo "Done";
 --> /   : NULL
 --> /rest/Users?filter={"id":"123"}   : NULL
 --> %:x   : NULL
+--> https://example.com:0/   : NULL
 --> http:///blah.com   : bool(false)
 --> http://:80   : bool(false)
 --> http://user@:80   : bool(false)

ext/standard/tests/url/parse_url_basic_005.phpt

@@ -112,6 +112,7 @@ echo "Done";
 --> /   : NULL
 --> /rest/Users?filter={"id":"123"}   : NULL
 --> %:x   : NULL
+--> https://example.com:0/   : NULL
 --> http:///blah.com   : bool(false)
 --> http://:80   : bool(false)
 --> http://user@:80   : bool(false)

ext/standard/tests/url/parse_url_basic_006.phpt

@@ -112,6 +112,7 @@ echo "Done";
 --> /   : NULL
 --> /rest/Users?filter={"id":"123"}   : NULL
 --> %:x   : NULL
+--> https://example.com:0/   : NULL
 --> http:///blah.com   : bool(false)
 --> http://:80   : bool(false)
 --> http://user@:80   : bool(false)

ext/standard/tests/url/parse_url_basic_007.phpt

@@ -112,6 +112,7 @@ echo "Done";
 --> /   : string(1) "/"
 --> /rest/Users?filter={"id":"123"}   : string(11) "/rest/Users"
 --> %:x   : string(3) "%:x"
+--> https://example.com:0/   : string(1) "/"
 --> http:///blah.com   : bool(false)
 --> http://:80   : bool(false)
 --> http://user@:80   : bool(false)

ext/standard/tests/url/parse_url_basic_008.phpt

@@ -112,6 +112,7 @@ echo "Done";
 --> /   : NULL
 --> /rest/Users?filter={"id":"123"}   : string(19) "filter={"id":"123"}"
 --> %:x   : NULL
+--> https://example.com:0/   : NULL
 --> http:///blah.com   : bool(false)
 --> http://:80   : bool(false)
 --> http://user@:80   : bool(false)

ext/standard/tests/url/parse_url_basic_009.phpt

@@ -112,6 +112,7 @@ echo "Done";
 --> /   : NULL
 --> /rest/Users?filter={"id":"123"}   : NULL
 --> %:x   : NULL
+--> https://example.com:0/   : NULL
 --> http:///blah.com   : bool(false)
 --> http://:80   : bool(false)
 --> http://user@:80   : bool(false)

ext/standard/tests/url/parse_url_unterminated.phpt

@@ -861,6 +861,15 @@ echo "Done";
   string(3) "%:x"
 }
 
+--> https://example.com:0/: array(3) {
+  ["scheme"]=>
+  string(5) "https"
+  ["host"]=>
+  string(11) "example.com"
+  ["path"]=>
+  string(1) "/"
+}
+
 --> http:///blah.com: bool(false)
 
 --> http://:80: bool(false)

ext/standard/tests/url/urls.inc

@@ -92,6 +92,7 @@ $urls = array(
 '/',
 '/rest/Users?filter={"id":"123"}',
 '%:x',
+'https://example.com:0/',
 
 // Severely malformed URLs that do not parse:
 'http:///blah.com',

ext/standard/url.c

@@ -190,10 +190,11 @@ PHPAPI php_url *php_url_parse_ex(char const *str, size_t length)
 
 		if (pp - p > 0 && pp - p < 6 && (pp == ue || *pp == '/')) {
 			zend_long port;
+			char *end;
 			memcpy(port_buf, p, (pp - p));
 			port_buf[pp - p] = '\0';
-			port = ZEND_STRTOL(port_buf, NULL, 10);
-			if (port > 0 && port <= 65535) {
+			port = ZEND_STRTOL(port_buf, &end, 10);
+			if (port >= 0 && port <= 65535 && end != port_buf) {
 				ret->port = (unsigned short) port;
 				if (s + 1 < ue && *s == '/' && *(s + 1) == '/') { /* relative-scheme URL */
 				    s += 2;
@@ -254,10 +255,11 @@ PHPAPI php_url *php_url_parse_ex(char const *str, size_t length)
 				return NULL;
 			} else if (e - p > 0) {
 				zend_long port;
+				char *end;
 				memcpy(port_buf, p, (e - p));
 				port_buf[e - p] = '\0';
-				port = ZEND_STRTOL(port_buf, NULL, 10);
-				if (port > 0 && port <= 65535) {
+				port = ZEND_STRTOL(port_buf, &end, 10);
+				if (port >= 0 && port <= 65535 && end != port_buf) {
 					ret->port = (unsigned short)port;
 				} else {
 					php_url_free(ret);