cvs: php-src /main network.c
| From: | Felipe Pena | Date: | Fri, 24 Oct 2008 10:44:19 +0000 |
| Subject: | cvs: php-src /main network.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53691@lists.php.net to get a copy of this message | ||
felipe Fri Oct 24 10:44:19 2008 UTC
Modified files:
/php-src/main network.c
Log:
- 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.135&r2=1.136&diff_format=u
Index: php-src/main/network.c
diff -u php-src/main/network.c:1.135 php-src/main/network.c:1.136
--- php-src/main/network.c:1.135 Thu Aug 21 23:37:40 2008
+++ php-src/main/network.c Fri Oct 24 10:44:19 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.135 2008/08/21 23:37:40 pajoye Exp $ */
+/* $Id: network.c,v 1.136 2008/10/24 10:44:19 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