httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1787606 - /httpd/httpd/trunk/server/core.c
Date Sun, 19 Mar 2017 10:33:43 GMT
Author: icing
Date: Sun Mar 19 10:33:43 2017
New Revision: 1787606

URL: http://svn.apache.org/viewvc?rev=1787606&view=rev
Log:
On the trunk:

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


Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1787606&r1=1787605&r2=1787606&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Sun Mar 19 10:33:43 2017
@@ -5280,9 +5280,14 @@ static conn_rec *core_create_conn(apr_po
 
 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



Mime
View raw message