Commit a171bf08 authored by Doug MacEachern's avatar Doug MacEachern
Browse files

ap_content_length_filter has already set Content-Length 

before ap_set_keepalive is called.  need to remove this check
in order for keepalives to work.
PR:
Obtained from:
Submitted by:
Reviewed by:


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

modules/http/http_protocol.c

+7 −1
Original line number Diff line number Diff line
@@ -136,7 +136,14 @@ AP_DECLARE(int) ap_set_keepalive(request_rec *r) 
	&& ((r->status == HTTP_NOT_MODIFIED)

	    || (r->status == HTTP_NO_CONTENT)

	    || r->header_only

#if 0

            /* this was right in 1.x, but in 2.x

             * ap_content_length_filter has already set Content-Length

             * before this function is called

             * XXX: should there be a different check in place of this?

             */

	    || apr_table_get(r->headers_out, "Content-Length")

#endif

	    || ap_find_last_token(r->pool,

				  apr_table_get(r->headers_out,

						"Transfer-Encoding"),
@@ -1234,7 +1241,6 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter( 
    if (r->chunked) {

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

        apr_table_unset(r->headers_out, "Content-Length");



    }



    apr_table_setn(r->headers_out, "Content-Type", ap_make_content_type(r,