diff options
| author | Anatol Belski <ab@php.net> | 2017-04-25 12:59:22 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-04-25 12:59:22 +0200 |
| commit | faf19a77560954091213d2a300395817a52637ad (patch) | |
| tree | 87d9cc13ee4b0d1720c3bb00fe7bb00459ccb7db /main/streams/xp_socket.c | |
| parent | 44fdae4360b44df8150d14c032454c88c44da87d (diff) | |
| parent | cda7dcf4cacef3346f9dc2a4dc947e6a74769259 (diff) | |
| download | php-git-faf19a77560954091213d2a300395817a52637ad.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Follow up patch regarding bug #74216, see bug #74429
Diffstat (limited to 'main/streams/xp_socket.c')
| -rw-r--r-- | main/streams/xp_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 83b8fc7e30..b828bde081 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) { + if (e && *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) { + if (!e || !*e || *e == '/') { return estrndup(str, colon - str); } } |