[PHP-CVS] cvs: php-src(PHP_5_2) /main network.c

[Ilia Alshanetsky]

iliaa           Mon May  4 14:12:23 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/main       network.c 
  Log:
  
  Fixed bad merge
  
http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.17&r2=1.118.2.2.2.18&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.17 
php-src/main/network.c:1.118.2.2.2.18
--- php-src/main/network.c:1.118.2.2.2.17       Mon May  4 13:12:35 2009
+++ php-src/main/network.c      Mon May  4 14:12:23 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: network.c,v 1.118.2.2.2.17 2009/05/04 13:12:35 iliaa Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.18 2009/05/04 14:12:23 iliaa Exp $ */
 
 /*#define DEBUG_MAIN_NETWORK 1*/
 
@@ -423,14 +423,9 @@
                switch (sa->sa_family) {
 #if HAVE_GETADDRINFO && HAVE_IPV6
                        case AF_INET6:
-                               if (strstr(bindto, ':')) {
-                                       ((struct sockaddr_in6 
*)sa)->sin6_family = sa->sa_family;
-                                       ((struct sockaddr_in6 *)sa)->sin6_port 
= htons(port);
-                                       socklen = sizeof(struct sockaddr_in6);
-                               } else {
-                                       socklen = 0;
-                                       sa = NULL;
-                               }
+                               ((struct sockaddr_in6 *)sa)->sin6_family = 
sa->sa_family;
+                               ((struct sockaddr_in6 *)sa)->sin6_port = 
htons(port);
+                               socklen = sizeof(struct sockaddr_in6);
                                break;
 #endif
                        case AF_INET:



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