[PHP-CVS] cvs: php-src(PHP_5_0) /ext/sockets sockets.c

[Jani Taskinen]

sniper          Mon Feb 14 18:44:31 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/sockets        sockets.c 
  Log:
  MFH
  
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.165.2.2&r2=1.165.2.3&ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.165.2.2 
php-src/ext/sockets/sockets.c:1.165.2.3
--- php-src/ext/sockets/sockets.c:1.165.2.2     Sat Feb 12 13:15:03 2005
+++ php-src/ext/sockets/sockets.c       Mon Feb 14 18:44:31 2005
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sockets.c,v 1.165.2.2 2005/02/12 18:15:03 sniper Exp $ */
+/* $Id: sockets.c,v 1.165.2.3 2005/02/14 23:44:31 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -663,6 +663,8 @@
                RETURN_FALSE;
        }
 
+       php_sock->error = 0;
+
        ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -681,10 +683,11 @@
        ZEND_FETCH_RESOURCE(php_sock, php_socket *, &arg1, -1, le_socket_name, 
le_socket);
        
        if (!php_accept_connect(php_sock, &new_sock, (struct sockaddr *) &sa 
TSRMLS_CC)) {
-               PHP_SOCKET_ERROR(new_sock, "unable to accept socket 
connection", errno);
                RETURN_FALSE;
        }
-       
+
+       new_sock->error = 0;
+
        ZEND_REGISTER_RESOURCE(return_value, new_sock, le_socket);
 }
 /* }}} */
@@ -1049,6 +1052,8 @@
                RETURN_FALSE;
        }
 
+       php_sock->error = 0;
+
        ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -1685,6 +1690,8 @@
        php_sock[1]->bsd_socket = fds_array[1];
        php_sock[0]->type               = domain;
        php_sock[1]->type               = domain;
+       php_sock[0]->error              = 0;
+       php_sock[1]->error              = 0;
 
        ZEND_REGISTER_RESOURCE(retval[0], php_sock[0], le_socket);
        ZEND_REGISTER_RESOURCE(retval[1], php_sock[1], le_socket);

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