sniper Mon Feb 14 17:17:31 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/sockets sockets.c
Log:
MFH: - Removed duplicate error + reset error in new sockets
http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.125.2.25&r2=1.125.2.26&ty=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.125.2.25
php-src/ext/sockets/sockets.c:1.125.2.26
--- php-src/ext/sockets/sockets.c:1.125.2.25 Sat Feb 12 13:16:04 2005
+++ php-src/ext/sockets/sockets.c Mon Feb 14 17:17:30 2005
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.125.2.25 2005/02/12 18:16:04 sniper Exp $ */
+/* $Id: sockets.c,v 1.125.2.26 2005/02/14 22:17:30 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -644,6 +644,8 @@
RETURN_FALSE;
}
+ sock->error = 0;
+
ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
}
/* }}} */
@@ -662,10 +664,10 @@
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_error(E_WARNING, "%s() unable to accept socket connection
[%d]: %s",
- get_active_function_name(TSRMLS_C), errno,
php_strerror(errno TSRMLS_CC));
RETURN_FALSE;
}
+
+ new_sock->error = 0;
ZEND_REGISTER_RESOURCE(return_value, new_sock, le_socket);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
