Commit c249202a authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Fix a timed out connection going into the keep-alive state after a timeout 

when discarding a request body.

PR: 51103


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103213 13f79535-47bb-0310-9956-ffa450edef68
parent 23d93d5d

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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]

modules/filters/mod_reqtimeout.c

+7 −0
Changes for modules/filters/mod_reqtimeout.c: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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;

}