summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-11-15 23:37:50 +0000
committerSascha Schumann <sas@php.net>2000-11-15 23:37:50 +0000
commit4bb564ad2b9df9b1730f64a01516eab1b62d0476 (patch)
treefff6031fc4533abeeb20fe6bbaad7aee662dc4d1
parentd1cecd1dd2be1375dbf844e82861f5d356217a08 (diff)
downloadphp-git-4bb564ad2b9df9b1730f64a01516eab1b62d0476.tar.gz
Clear idle_read_timer
-rw-r--r--sapi/thttpd/thttpd_patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/sapi/thttpd/thttpd_patch b/sapi/thttpd/thttpd_patch
index 6ad1b65d7b..ff6b60d991 100644
--- a/sapi/thttpd/thttpd_patch
+++ b/sapi/thttpd/thttpd_patch
@@ -121,14 +121,16 @@ diff -Nur thttpd-2.20b/libhttpd.h thttpd-2.20b-php/libhttpd.h
diff -Nur thttpd-2.20b/thttpd.c thttpd-2.20b-php/thttpd.c
--- thttpd-2.20b/thttpd.c Wed Sep 27 21:31:48 2000
+++ thttpd-2.20b-php/thttpd.c Mon Nov 13 14:25:57 2000
-@@ -1333,6 +1333,10 @@
+@@ -1332,6 +1333,12 @@
+ c->bytes_sent = hc->bytes;
clear_connection( c, tvP );
return;
- }
++ }
+ if (hc->file_address == (char *) 1) {
+ tmr_cancel( c->idle_read_timer );
++ c->idle_read_timer = (Timer*) 0;
++ c->wouldblock_delay = 0;
+ return;
-+ }
+ }
if ( c->bytes_sent >= c->bytes_to_send )
{
- /* There's nothing to send. */