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

wez Mon Apr 19 08:43:27 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/main network.c Log: MFH: timeout duration too long in liveness checks for sockets. Fixes Bug #28055 http://cvs.php.net/diff.php/php-src/main/network.c?r1=1.83.2.23&r2=1.83.2.24&ty=u Index: php-src/main/network.c diff -u php-src/main/network.c:1.83.2.23 php-src/main/network.c:1.83.2.24 --- php-src/main/network.c:1.83.2.23 Wed Jan 14 09:54:14 2004 +++ php-src/main/network.c Mon Apr 19 08:43:26 2004 @@ -16,7 +16,7 @@ | Streams work by Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.83.2.23 2004/01/14 14:54:14 wez Exp $ */ +/* $Id: network.c,v 1.83.2.24 2004/04/19 12:43:26 wez Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -1155,15 +1155,9 @@ int alive = 1; int fd = sock->socket; fd_set rfds; - struct timeval tv; + struct timeval tv = {0, 0}; char buf; - if (sock->timeout.tv_sec == -1) { - tv.tv_sec = FG(default_socket_timeout); - } else { - tv = sock->timeout; - } - /* logic: if the select call indicates that there is data to * be read, but a read returns 0 bytes of data, then the socket * has been closed.