cvs: php4(PHP_4_2_0) /ext/standard fsock.c

derick Mon Mar 18 16:40:56 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/standard fsock.c Log: - MFH for bugfix for bug #10001 Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.84 php4/ext/standard/fsock.c:1.84.2.1 --- php4/ext/standard/fsock.c:1.84 Tue Dec 11 10:30:31 2001 +++ php4/ext/standard/fsock.c Mon Mar 18 16:40:55 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.84 2001/12/11 15:30:31 sebastian Exp $ */ +/* $Id: fsock.c,v 1.84.2.1 2002/03/18 21:40:55 derick Exp $ */ /* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */ /* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */ @@ -495,6 +495,7 @@ static void php_sockread_total(php_sockbuf *sock, size_t maxread) { + sock->timeout_event = 0; while(!sock->eof && TOREAD(sock) < maxread && !sock->timeout_event) { php_sockread_internal(sock); } @@ -555,6 +556,8 @@ } SEARCHCR(); + + sock->timeout_event = 0; if(!p) { if(sock->is_blocked) {