commit 38af3ed363b6e9d99771729cab2115d8ebc733f6
author Jean-Frederic Clere <jfclere@apache.org> Wed Mar 24 09:37:15 2021 +0000
committer Jean-Frederic Clere <jfclere@apache.org> Wed Mar 24 09:37:15 2021 +0000
tree 4016ff57de7862f6bc217befe4768f425281e2f5
parent b1ae175f07680940ed4345af4323bdc61f820cbb

Make sure that conn->keepalive is NOT reset after being set in ap_read_request().


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

modules/http/http_core.c

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 3f87f80..9e875ce 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -146,9 +146,6 @@
             ap_set_conn_count(c->sbh, r, c->keepalives);
         }
         if ((r = ap_read_request(c))) {
-            c->keepalive = AP_CONN_UNKNOWN;
-            /* process the request if it was read without error */
-
             if (r->status == HTTP_OK) {
                 cs->state = CONN_STATE_HANDLER;
                 if (ap_extended_status) {
@@ -204,9 +201,6 @@
             keep_alive_timeout = c->base_server->keep_alive_timeout;
         }
 
-        c->keepalive = AP_CONN_UNKNOWN;
-        /* process the request if it was read without error */
-
         if (r->status == HTTP_OK) {
             if (cs)
                 cs->state = CONN_STATE_HANDLER;

server/protocol.c

diff --git a/server/protocol.c b/server/protocol.c
index d18ca01..4eac201 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1469,6 +1469,7 @@
     request_rec *r = ap_create_request(conn);
 
     tmp_bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);
+    conn->keepalive = AP_CONN_UNKNOWN;
 
     ap_run_pre_read_request(r, conn);