Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Revert "Detect invalid port in xp_socket parse ip address"
  Revert "Follow up patch regarding bug #74216, see bug #74429"

Author: weltling

ext/standard/tests/streams/parseip-001.phpt

@@ -571,44 +571,37 @@ static inline char *parse_ip_address_ex(const char *str, size_t str_len, int *po
 	char *host = NULL;
 
 #ifdef HAVE_IPV6
+	char *p;
+
 	if (*(str) == '[' && str_len > 1) {
 		/* IPV6 notation to specify raw address with port (i.e. [fe80::1]:80) */
-		char *p = memchr(str + 1, ']', str_len - 2), *e = NULL;
+		p = memchr(str + 1, ']', str_len - 2);
 		if (!p || *(p + 1) != ':') {
 			if (get_err) {
 				*err = strpprintf(0, "Failed to parse IPv6 address \"%s\"", str);
 			}
 			return NULL;
 		}
-		*portno = strtol(p + 2, &e, 10);
-		if (e && *e && *e != '/') {
-			if (get_err) {
-				*err = strpprintf(0, "Failed to parse address \"%s\"", str);
-			}
-			return NULL;
-		}
+		*portno = atoi(p + 2);
 		return estrndup(str + 1, p - str - 1);
 	}
 #endif
-
 	if (str_len) {
 		colon = memchr(str, ':', str_len - 1);
 	} else {
 		colon = NULL;
 	}
-
 	if (colon) {
-		char *e = NULL;
-		*portno = strtol(colon + 1, &e, 10);
-		if (!e || !*e || *e == '/') {
-			return estrndup(str, colon - str);
+		*portno = atoi(colon + 1);
+		host = estrndup(str, colon - str);
+	} else {
+		if (get_err) {
+			*err = strpprintf(0, "Failed to parse address \"%s\"", str);
 		}
+		return NULL;
 	}
 
-	if (get_err) {
-		*err = strpprintf(0, "Failed to parse address \"%s\"", str);
-	}
-	return NULL;
+	return host;
 }
 
 static inline char *parse_ip_address(php_stream_xport_param *xparam, int *portno)