From ad79dc4101afd796e6f47342838a40102552e610 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Sun, 19 Mar 2017 10:33:43 +0000 Subject: [PATCH] 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 --- server/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/core.c b/server/core.c index f95aa0da9c..4bdcb8fded 100644 --- 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 -- 2.40.0