Commit 01645c70 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

The ap_set_keepalive call needs to be after the call to 

ap_basic_http_header.  Without this, there are times that HTTP 1.0
requests will do keepalive connections.


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

modules/http/http_protocol.c

+2 −2
Original line number Diff line number Diff line
@@ -2479,8 +2479,6 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f, apr_b 
	fixup_vary(r);

    }



    ap_set_keepalive(r);



    if (r->chunked) {

        apr_table_mergen(r->headers_out, "Transfer-Encoding", "chunked");

        apr_table_unset(r->headers_out, "Content-Length");
@@ -2586,6 +2584,8 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f, apr_b 


    terminate_header(buff);



    ap_set_keepalive(r);



    r->sent_bodyct = 1;         /* Whatever follows is real body stuff... */



    b2 = apr_brigade_create(r->pool);