svn commit: r1103213 - in /httpd/httpd/trunk: CHANGES modules/filters/mod_reqtimeout.c

[sf...@apache.org]

Author: sf
Date: Sat May 14 20:25:55 2011
New Revision: 1103213

URL: http://svn.apache.org/viewvc?rev=1103213&view=rev
Log:
Fix a timed out connection going into the keep-alive state after a timeout
when discarding a request body.

PR: 51103

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/filters/mod_reqtimeout.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1103213&r1=1103212&r2=1103213&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat May 14 20:25:55 2011
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.3.13
 
+  *) mod_reqtimeout: Fix a timed out connection going into the keep-alive
+     state after a timeout when discarding a request body. PR 51103.
+     [Stefan Fritsch]
+
   *) core: Add various file existance test operators to ap_expr.
      [Stefan Fritsch]
 

Modified: httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reqtimeout.c?rev=1103213&r1=1103212&r2=1103213&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Sat May 14 20:25:55 2011
@@ -306,6 +306,13 @@ out:
          * 2s (SECONDS_TO_LINGER).
          */
         apr_table_setn(f->c->notes, "short-lingering-close", "1");
+
+        /*
+         * Also, we must not allow keep-alive requests, as
+         * ap_finalize_protocol() may ignore our error status (if the timeout
+         * happened on a request body that is discarded).
+         */
+        f->c->keepalive = AP_CONN_CLOSE;
     }
     return rv;
 }