From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 30 Sep 2009 20:48:41 +0000 (+0000)
Subject: Fixed bug #48805 (IPv6 socket transport is not working).
X-Git-Tag: php-5.2.12RC1~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce1b22fd85b4fed5453f838dc3470e689b576cce;p=php

Fixed bug #48805 (IPv6 socket transport is not working).
---

diff --git a/NEWS b/NEWS
index 61701bac22..64139dfad6 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@
   of a multibyte character). (Moriyoshi)
 - Fixed bug #49528 (UTF-16 strings prefixed by BOMs wrondly converted).
   (Moriyoshi)
+- Fixed bug #48805 (IPv6 socket transport is not working). (Ilia)
 
 17 Sep 2009, PHP 5.2.11
 - Fixed certificate validation inside php_openssl_apply_verification_policy.
diff --git a/main/network.c b/main/network.c
index 7269a51ae8..33b81d1d77 100644
--- a/main/network.c
+++ b/main/network.c
@@ -786,7 +786,7 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
 		switch (sa->sa_family) {
 #if HAVE_GETADDRINFO && HAVE_IPV6
 			case AF_INET6:
-				if (bindto && strchr(bindto, ':')) {
+				if (!bindto || strchr(bindto, ':')) {
 					((struct sockaddr_in6 *)sa)->sin6_family = sa->sa_family;
 					((struct sockaddr_in6 *)sa)->sin6_port = htons(port);
 					socklen = sizeof(struct sockaddr_in6);