felipe Fri Oct 24 10:44:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main network.c
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.6.2.8&r2=1.118.2.2.2.6.2.9&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.118.2.2.2.6.2.8
php-src/main/network.c:1.118.2.2.2.6.2.9
--- php-src/main/network.c:1.118.2.2.2.6.2.8 Sat Aug 23 19:22:10 2008
+++ php-src/main/network.c Fri Oct 24 10:44:43 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.118.2.2.2.6.2.8 2008/08/23 19:22:10 pajoye Exp $ */
+/* $Id: network.c,v 1.118.2.2.2.6.2.9 2008/10/24 10:44:43 felipe Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -1057,7 +1057,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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
