diff options
author | Joe Watkins <krakjoe@php.net> | 2018-09-04 11:12:26 +0200 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2018-09-04 11:12:39 +0200 |
commit | 21f8cd2a92fc105a0a782e35658389d0dc33a0c9 (patch) | |
tree | 3544bda11eca25f3831804cef1b145eaffebafaf /main/network.c | |
parent | 64d2978546721cf7b1c3723e28cad89e1631570e (diff) | |
parent | 0f724453c03b7ff500563c019f5dab736d326ad8 (diff) | |
download | php-git-21f8cd2a92fc105a0a782e35658389d0dc33a0c9.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #74764 and add a test case
Diffstat (limited to 'main/network.c')
-rw-r--r-- | main/network.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/network.c b/main/network.c index 30e2200390..c5cf5a5f06 100644 --- a/main/network.c +++ b/main/network.c @@ -851,6 +851,9 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short int local_address_len = 0; if (sa->sa_family == AF_INET) { + if (strchr(bindto,':')) { + goto skip_bind; + } struct sockaddr_in *in4 = emalloc(sizeof(struct sockaddr_in)); local_address = (struct sockaddr*)in4; |