Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 56295 invoked by uid 500); 24 Jan 2001 23:07:33 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 56262 invoked by uid 500); 24 Jan 2001 23:07:30 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 24 Jan 2001 23:07:26 -0000 Message-ID: <20010124230726.56244.qmail@apache.org> From: rbb@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/http http_protocol.c rbb 01/01/24 15:07:26 Modified: modules/http http_protocol.c Log: 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. Revision Changes Path 1.276 +2 -2 httpd-2.0/modules/http/http_protocol.c Index: http_protocol.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/http/http_protocol.c,v retrieving revision 1.275 retrieving revision 1.276 diff -u -d -b -w -u -r1.275 -r1.276 --- http_protocol.c 2001/01/24 22:47:57 1.275 +++ http_protocol.c 2001/01/24 23:07:23 1.276 @@ -2479,8 +2479,6 @@ 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"); @@ -2585,6 +2583,8 @@ } terminate_header(buff); + + ap_set_keepalive(r); r->sent_bodyct = 1; /* Whatever follows is real body stuff... */