Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug #74764 and add a test case
This commit is contained in:
Joe Watkins 2018-09-04 11:12:57 +02:00
commit 6b5e7e6b42
No known key found for this signature in database
GPG key ID: F9BA0ADA31CBD89E
3 changed files with 29 additions and 0 deletions

View file

@ -839,6 +839,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;