From: foobar <sniper@php.net>
Date: Mon, 14 Feb 2005 23:44:31 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.0.4RC1~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=324ea3636dbcc5148da457bca20e696b1056be1d;p=php

MFH
---

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index c42b5ee5dc..c6bf02d8d4 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -663,6 +663,8 @@ PHP_FUNCTION(socket_create_listen)
 		RETURN_FALSE;
 	}
 
+	php_sock->error = 0;
+
 	ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -681,10 +683,11 @@ PHP_FUNCTION(socket_accept)
 	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 @@ PHP_FUNCTION(socket_create)
 		RETURN_FALSE;
 	}
 
+	php_sock->error = 0;
+
 	ZEND_REGISTER_RESOURCE(return_value, php_sock, le_socket);
 }
 /* }}} */
@@ -1685,6 +1690,8 @@ PHP_FUNCTION(socket_create_pair)
 	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);