cvs: php4 /sapi/thttpd thttpd_patch
| From: | Sascha Schumann | Date: | Wed, 15 Nov 2000 23:37:50 +0000 |
| Subject: | cvs: php4 /sapi/thttpd thttpd_patch | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2628@lists.php.net to get a copy of this message | ||
sas Wed Nov 15 15:37:50 2000 EDT
Modified files:
/php4/sapi/thttpd thttpd_patch
Log:
Clear idle_read_timer
Index: php4/sapi/thttpd/thttpd_patch
diff -u php4/sapi/thttpd/thttpd_patch:1.6 php4/sapi/thttpd/thttpd_patch:1.7
--- php4/sapi/thttpd/thttpd_patch:1.6 Mon Nov 13 05:33:12 2000
+++ php4/sapi/thttpd/thttpd_patch Wed Nov 15 15:37:50 2000
@@ -121,14 +121,16 @@
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. */