[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_1/main/ network.c

[Pierre-Alain Joye]

pajoye                                   Sat, 10 Oct 2009 12:21:08 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=289498

Log:
- Merge: Fixed bug #48805 (IPv6 socket transport is not working)

Bug: http://bugs.php.net/48805 (Closed) IPv6 socket transport is not working
      
Changed paths:
    U   php/php-src/branches/PHP_5_3_1/main/network.c

Modified: php/php-src/branches/PHP_5_3_1/main/network.c
===================================================================
--- php/php-src/branches/PHP_5_3_1/main/network.c       2009-10-10 09:49:29 UTC 
(rev 289497)
+++ php/php-src/branches/PHP_5_3_1/main/network.c       2009-10-10 12:21:08 UTC 
(rev 289498)
@@ -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);


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php