From: Graham Leggett <minfrin@apache.org>
Date: Sun, 26 Sep 2021 14:14:37 +0000 (+0000)
Subject: Backport:
X-Git-Tag: candidate-2.4.50-rc1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6aaf9139eda060c69f3144d7613d7f52992a4fc;p=thirdparty%2Fapache%2Fhttpd.git

Backport:

*) core: do not install core input/output filters on secondary
   connections.
   Trunk version of patch:
     http://svn.apache.org/viewvc?view=revision&revision=1787606
   Backport version for 2.4.x of patch:
     svn merge -c 1787606 ^/httpd/httpd/trunk .
   +1: icing, rpluem, ylavic



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

diff --git a/CHANGES b/CHANGES
index 90b82c23599..2bcf3895016 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.50
 
+  *) core: do not install core input/output filters on secondary
+     connections. [Stefan Eissing]
+
   *) core: Add ap_pre_connection() as a wrapper to ap_run_pre_connection()
      and use it to prevent that failures in running the pre_connection
      hook cause crashes afterwards. [Ruediger Pluem]
diff --git a/STATUS b/STATUS
index 1d1e2830ebb..0afaf501bf0 100644
--- a/STATUS
+++ b/STATUS
@@ -142,14 +142,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) core: do not install core input/output filters on secondary
-     connections.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=revision&revision=1787606
-     Backport version for 2.4.x of patch:
-       svn merge -c 1787606 ^/httpd/httpd/trunk .
-     +1: icing, rpluem, ylavic
-
   *) mod_dav: Correctly handle errors returned by dav providers on REPORT
      requests.
      Trunk version of patch:
diff --git a/server/core.c b/server/core.c
index f30e23715cb..798212b4808 100644
--- a/server/core.c
+++ b/server/core.c
@@ -5257,9 +5257,14 @@ static conn_rec *core_create_conn(apr_pool_t *ptrans, server_rec *server,
 
 static int core_pre_connection(conn_rec *c, void *csd)
 {
-    core_net_rec *net = apr_palloc(c->pool, sizeof(*net));
+    core_net_rec *net;
     apr_status_t rv;
 
+    if (c->master) {
+        return DONE;
+    }
+    
+    net = apr_palloc(c->pool, sizeof(*net));
     /* The Nagle algorithm says that we should delay sending partial
      * packets in hopes of getting more data.  We don't want to do
      * this; we are not telnet.  There are bad interactions between