iliaa Sun Feb 8 16:54:43 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams xp_socket.c
Log:
MFB52: Fixed bug #44874 (dead pfsockopen'ed sockets aren't reaped when the
remote end restarts)
# Patch by Richard dot Krehbiel at gmail dot com
http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.14&r2=1.33.2.2.2.15&diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.14
php-src/main/streams/xp_socket.c:1.33.2.2.2.15
--- php-src/main/streams/xp_socket.c:1.33.2.2.2.14 Wed Jan 7 20:41:47 2009
+++ php-src/main/streams/xp_socket.c Sun Feb 8 16:54:43 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_socket.c,v 1.33.2.2.2.14 2009/01/07 20:41:47 felipe Exp $ */
+/* $Id: xp_socket.c,v 1.33.2.2.2.15 2009/02/08 16:54:43 iliaa Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -281,7 +281,7 @@
if (sock->socket == -1) {
alive = 0;
} else if (php_pollfd_for(sock->socket,
PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
- if (0 == recv(sock->socket, &buf,
sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) {
+ if (0 >= recv(sock->socket, &buf,
sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) {
alive = 0;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
