svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/main/network.c branches/PHP_5_3/NEWS branches/PHP_5_3/main/network.c trunk/main/network.c

iliaa Wed, 30 Sep 2009 20:48:41 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=289019 Log: Fixed bug #48805 (IPv6 socket transport is not working). Bug: http://bugs.php.net/48805 (Assigned) IPv6 socket transport is not working Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/main/network.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/main/network.c U php/php-src/trunk/main/network.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2009-09-30 20:20:04 UTC (rev 289018) +++ php/php-src/branches/PHP_5_2/NEWS 2009-09-30 20:48:41 UTC (rev 289019) @@ -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. Modified: php/php-src/branches/PHP_5_2/main/network.c =================================================================== --- php/php-src/branches/PHP_5_2/main/network.c 2009-09-30 20:20:04 UTC (rev 289018) +++ php/php-src/branches/PHP_5_2/main/network.c 2009-09-30 20:48:41 UTC (rev 289019) @@ -786,7 +786,7 @@ 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); Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2009-09-30 20:20:04 UTC (rev 289018) +++ php/php-src/branches/PHP_5_3/NEWS 2009-09-30 20:48:41 UTC (rev 289019) @@ -19,6 +19,7 @@ cannot be set"). (Felipe) - Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after fclose). (Ilia) +- Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) ?? ??? 2009, PHP 5.3.1RC? <- WHY IS THIS HERE? Gonna be released after 5.3.1 or what?? - Upgraded bundled sqlite to version 3.6.18. (Ilia) Modified: php/php-src/branches/PHP_5_3/main/network.c =================================================================== --- php/php-src/branches/PHP_5_3/main/network.c 2009-09-30 20:20:04 UTC (rev 289018) +++ php/php-src/branches/PHP_5_3/main/network.c 2009-09-30 20:48:41 UTC (rev 289019) @@ -792,7 +792,7 @@ 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); Modified: php/php-src/trunk/main/network.c =================================================================== --- php/php-src/trunk/main/network.c 2009-09-30 20:20:04 UTC (rev 289018) +++ php/php-src/trunk/main/network.c 2009-09-30 20:48:41 UTC (rev 289019) @@ -792,7 +792,7 @@ 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);