summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerick Rethans <derick@php.net>2002-03-18 21:40:55 +0000
committerDerick Rethans <derick@php.net>2002-03-18 21:40:55 +0000
commite2ecf549e19c4af152a3a240f02d72321e234860 (patch)
tree4614ce57672632c3ad66d8be6301962ffad48d54
parent8daa261b97d106e337a6e95cabe0d02c87fed5e4 (diff)
downloadphp-git-e2ecf549e19c4af152a3a240f02d72321e234860.tar.gz
- MFH for bugfix for bug #10001
-rw-r--r--ext/standard/fsock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index b1e1314800..70639dcdc8 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -495,6 +495,7 @@ static size_t php_sockread_internal(php_sockbuf *sock)
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);
}
@@ -556,6 +557,8 @@ static char * php_sock_fgets_internal(char * buf, size_t maxlen, php_sockbuf * s
SEARCHCR();
+ sock->timeout_event = 0;
+
if(!p) {
if(sock->is_blocked) {
while(!p && !sock->eof && !sock->timeout_event && TOREAD(sock) < maxlen) {