Patch socket-patch for Sockets related Bug #60048

Patch version 2011-10-13 07:51 UTC

• 2011-10-13 07:51 UTC [diff to current]

Developer: china@thewrittenword.com

Index: ext/sockets/sockets.c
===================================================================
--- ext/sockets/sockets.c.orig	2011-09-15 16:23:28.530678580 +0000
+++ ext/sockets/sockets.c	2011-10-13 07:31:13.408283904 +0000
@@ -884,7 +888,7 @@
 	zval				 *arg1;
 	php_socket			 *php_sock, *new_sock;
 	php_sockaddr_storage sa;
-	socklen_t			 sa_len = sizeof(sa);
+	socklen_t			 php_sa_len = sizeof(sa);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) {
 		return;
@@ -892,7 +896,7 @@
 
 	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, &sa_len TSRMLS_CC)) {
+	if (!php_accept_connect(php_sock, &new_sock, (struct sockaddr*)&sa, &php_sa_len TSRMLS_CC)) {
 		RETURN_FALSE;
 	}