- Fixed bug #60048 (sa_len a #define on IRIX)

  patch by: china at thewrittenword dot com

2 files changed, 10 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index d022d94802..d8462b4c4f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,12 +3,13 @@ PHP                                                                        NEWS
 ?? ??? 2011, PHP 5.3.9
 
 - Core:
-  . Fixed bug #55859 (mysqli->stat property access gives error). (Andrey)
   . Fixed bug #55798 (serialize followed by unserialize with numeric object
     prop. gives integer prop). (Gustavo)
   . Fixed bug #55749 (TOCTOU issue in getenv() on Windows builds). (Pierre)
   . Fixed bug #55707 (undefined reference to `__sync_fetch_and_add_4' on Linux
     parisc). (Felipe)
+  . Fixed bug #55674 (fgetcsv & str_getcsv skip empty fields in some
+    tab-separated records). (Laruence)
   . Fixed bug #55649 (Undefined function Bug()). (Laruence)
   . Fixed bug #55622 (memory corruption in parse_ini_string). (Pierre)
   . Fixed bug #55576 (Cannot conditionally move uploaded file without race
@@ -25,8 +26,6 @@ PHP                                                                        NEWS
   . Fixed bug #55366 (keys lost when using substr_replace an array) (Arpad)
   . Fixed bug #55273 (base64_decode() with strict rejects whitespace after
     pad). (Ilia)
-  . Fixed bug #54304 (RegexIterator::accept() doesn't work with scalar values).
-    (Hannes)
   . Fixed bug #50982 (incorrect assumption of PAGE_SIZE size). (Dmitry)
 
 - Calendar:
@@ -47,6 +46,7 @@ PHP                                                                        NEWS
   . Fixed bug #55550 (mysql.trace_mode miscounts result sets). (Johannes)
 
 - MySQLi extension:
+  . Fixed bug #55859 (mysqli->stat property access gives error). (Andrey)
   . Fixed bug #55582 (mysqli_num_rows() returns always 0 for unbuffered, when
   mysqlnd is used). (Andrey)
   . Fixed bug #55703 (PHP crash when calling mysqli_fetch_fields). 
@@ -106,14 +106,15 @@ PHP                                                                        NEWS
   . Reverted the SimpleXML->query() behaviour to returning empty arrays
     instead of false when no nodes are found as it was since 5.3.3 
     (bug #48601). (chregu, rrichards)
-    
-- String:
-  . Fixed bug #55674 (fgetcsv & str_getcsv skip empty fields in some tab-separated 
-    records). (Laruence)
+
+- Sockets:
+  . Fixed bug #60048 (sa_len a #define on IRIX). (china at thewrittenword dot com)
 
 - SPL:
   . Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY).
     (jgotti at modedemploi dot fr, Hannes)
+  . Fixed bug #54304 (RegexIterator::accept() doesn't work with scalar values).
+    (Hannes)
     
 - XSL:
   . Added xsl.security_prefs ini option to define forbidden operations within XSLT 
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index eb0db1e5c8..d1dd28a4f8 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -884,7 +884,7 @@ PHP_FUNCTION(socket_accept)
 	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 +892,7 @@ 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, &sa_len TSRMLS_CC)) {
+	if (!php_accept_connect(php_sock, &new_sock, (struct sockaddr*)&sa, &php_sa_len TSRMLS_CC)) {
 		RETURN_FALSE;
 	}