From: Ryan Bloom <rbb@apache.org>
Date: Wed, 24 Jan 2001 23:07:23 +0000 (+0000)
Subject: The ap_set_keepalive call needs to be after the call to
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c422d9675458e9b6de196b18e454990f34fa186c;p=apache

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
---

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 358412ae30..cd6684b1ec 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -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);