summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-04-27 02:49:01 +0200
committerAnatol Belski <ab@php.net>2017-04-27 11:16:56 +0200
commitc070353420e5fd880f79dc2d7121765d15f41e29 (patch)
tree8e0f5c57b9d7bc7b94ced77f7794267cd7bf7be0
parent9e89e62148a5b6d554fc55943d3b799b4688ae67 (diff)
downloadphp-git-c070353420e5fd880f79dc2d7121765d15f41e29.tar.gz
Revert "Follow up patch regarding bug #74216, see bug #74429"
This reverts commit cda7dcf4cacef3346f9dc2a4dc947e6a74769259. (cherry picked from commit bf3e2dce7b54988d82f16ee3564c14f1b5cd936b)
-rw-r--r--main/streams/xp_socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c
index 92be333260..3ff64787aa 100644
--- a/main/streams/xp_socket.c
+++ b/main/streams/xp_socket.c
@@ -581,7 +581,7 @@ static inline char *parse_ip_address_ex(const char *str, size_t str_len, int *po
return NULL;
}
*portno = strtol(p + 2, &e, 10);
- if (e && *e && *e != '/') {
+ if (e && *e) {
if (get_err) {
*err = strpprintf(0, "Failed to parse address \"%s\"", str);
}
@@ -600,7 +600,7 @@ static inline char *parse_ip_address_ex(const char *str, size_t str_len, int *po
if (colon) {
char *e = NULL;
*portno = strtol(colon + 1, &e, 10);
- if (!e || !*e || *e == '/') {
+ if (!e || !*e) {
return estrndup(str, colon - str);
}
}