From: Jim Jagielski <jim@apache.org>
Date: Thu, 23 Apr 2020 12:33:29 +0000 (+0000)
Subject: Merge r1876540 from trunk:
X-Git-Tag: 2.4.44~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a2ab5370fdf3ecb36764d69ddfb14f55b883493;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1876540 from trunk:

PR64295 cannot override default Virtualhost's mod_reqtimeout
of course only body=n can work the headers have to parsed to get the virtualhost.

Submitted by: jfclere
Reviewed by: jailletc36, rpluem, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1876888 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index da4990aebc1..9ba13d64c08 100644
--- a/STATUS
+++ b/STATUS
@@ -135,12 +135,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_reqtimeout: cannot override default Virtualhost's mod_reqtimeout. PR64295
-     trunk patch:
-       - http://svn.apache.org/r1876540
-     2.4.x patch: svn merge -c 1876540 ^/httpd/httpd/trunk .
-     +1: jfclere, rpluem, jim
-
   *) mod_http2: Fixed regression that no longer set H2_STREAM_ID and H2_STREAM_TAG.
      PR64330 [Stefan Eissing]
      trunk patch:
diff --git a/modules/filters/mod_reqtimeout.c b/modules/filters/mod_reqtimeout.c
index 68d82d49e43..0ebd78a38e3 100644
--- a/modules/filters/mod_reqtimeout.c
+++ b/modules/filters/mod_reqtimeout.c
@@ -436,8 +436,8 @@ static int reqtimeout_before_body(request_rec *r)
         /* not configured for this connection */
         return OK;
     }
-    cfg = ap_get_module_config(r->connection->base_server->module_config,
-                               &reqtimeout_module);
+    cfg = ap_get_module_config(r->server->module_config,
+                              &reqtimeout_module);
     AP_DEBUG_ASSERT(cfg != NULL);
 
     ccfg->type = "body";