cvs: php-src(PHP_5_2) / NEWS /main network.c

felipe Fri Oct 24 10:46:05 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/main network.c /php-src NEWS Log: - MFH: Fixed bug #46082 (stream_set_blocking() can cause a crash in some circumstances) http://cvs.php.net/viewvc.cgi/php-src/main/network.c?r1=1.118.2.2.2.10&r2=1.118.2.2.2.11&diff_format=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.118.2.2.2.10 php-src/main/network.c:1.118.2.2.2.11 --- php-src/main/network.c:1.118.2.2.2.10 Fri Jul 11 13:12:18 2008 +++ php-src/main/network.c Fri Oct 24 10:46:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.118.2.2.2.10 2008/07/11 13:12:18 jani Exp $ */ +/* $Id: network.c,v 1.118.2.2.2.11 2008/10/24 10:46:05 felipe Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -1051,7 +1051,11 @@ /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */ flags = !block; if (ioctlsocket(socketd, FIONBIO, &flags) == SOCKET_ERROR) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", WSAGetLastError()); + char *error_string; + + error_string = php_socket_strerror(WSAGetLastError(), NULL, 0); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", error_string); + efree(error_string); ret = FAILURE; } #else http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1276&r2=1.2027.2.547.2.1277&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1276 php-src/NEWS:1.2027.2.547.2.1277 --- php-src/NEWS:1.2027.2.547.2.1276 Thu Oct 23 22:38:19 2008 +++ php-src/NEWS Fri Oct 24 10:46:05 2008 @@ -1,6 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? Nov 2008, PHP 5.2.7RC3 +- Fixed bug #46082 (stream_set_blocking() can cause a crash in some + circumstances). (Felipe) 23 Oct 2008, PHP 5.2.7RC2 - Upgraded bundled libzip to 0.9.0. (Pierre)