On the trunk:

core: avoid socket timeout settings etc. on slave connections.

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

diff --git a/server/core.c b/server/core.c
index f95aa0da9ccda9ebcf0ca113708b09de98a4162f..4bdcb8fdedb4a1ad11aac6b566cee55b15db421c 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -5280,9 +5280,14 @@ static conn_rec *core_create_conn(apr_pool_t *ptrans, server_rec *s,
 
 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