]> granicus.if.org Git - php/commitdiff
Clear idle_read_timer
authorSascha Schumann <sas@php.net>
Wed, 15 Nov 2000 23:37:50 +0000 (23:37 +0000)
committerSascha Schumann <sas@php.net>
Wed, 15 Nov 2000 23:37:50 +0000 (23:37 +0000)
sapi/thttpd/thttpd_patch

index 6ad1b65d7bbd28d011640b80e0ec66e9b039d47b..ff6b60d991981c67ebda13e9e2a75e44007d5327 100644 (file)
@@ -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. */