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

[Pierre Joye]

pajoye                                   Wed, 08 Sep 2010 11:51:11 +0000

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

Log:
- fix the fix for bug #52323

Bug: http://bugs.php.net/52323 (Feedback) php_network_connect_socket doesn't 
return all errors correctly
      
Changed paths:
    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_3/main/network.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/network.c 2010-09-08 11:47:10 UTC (rev 
303171)
+++ php/php-src/branches/PHP_5_3/main/network.c 2010-09-08 11:51:11 UTC (rev 
303172)
@@ -376,7 +376,7 @@
                *error_code = error;
        }

-       if (error && error_string) {
+       if (error) {
                ret = -1;
                if (error_string) {
                        *error_string = php_socket_strerror(error, NULL, 0);

Modified: php/php-src/trunk/main/network.c
===================================================================
--- php/php-src/trunk/main/network.c    2010-09-08 11:47:10 UTC (rev 303171)
+++ php/php-src/trunk/main/network.c    2010-09-08 11:51:11 UTC (rev 303172)
@@ -376,7 +376,7 @@
                *error_code = error;
        }

-       if (error && error_string) {
+       if (error) {
                ret = -1;
                if (error_string) {
                        *error_string = php_socket_strerror(error, NULL, 0);


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