com php-src: Revert "Follow up patch regarding bug #74216, see bug #74429": main/streams/xp_socket.c
[email protected] (Anatol Belski)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: bf3e2dce7b54988d82f16ee3564c14f1b5cd936b Author: Anatol Belski <[email protected]> Thu, 27 Apr 2017 02:49:01 +0200 Parents: 36301bd615a610d17880d1def060ce782df521ed Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bf3e2dce7b54988d82f16ee3564c14f1b5cd936b Log: Revert "Follow up patch regarding bug #74216, see bug #74429" This reverts commit cda7dcf4cacef3346f9dc2a4dc947e6a74769259. Bugs: https://bugs.php.net/74216 https://bugs.php.net/74429 Changed paths: M main/streams/xp_socket.c Diff: diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 92be333..3ff6478 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); } }