Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
From: Stefan Eissing <stefan.eissing@greenbytes.de>
Content-Type: multipart/mixed;
 boundary="Apple-Mail=_6CB0B781-9F8C-4721-A5CC-48EBE09BDCB0"
Subject: event mpm and slave connections
Message-Id: <EA7D420F-B62E-4C06-A2F6-94661AE1E4DB@greenbytes.de>
Date: Fri, 29 Jan 2016 14:01:30 +0100
To: dev@httpd.apache.org
Mime-Version: 1.0 (Mac OS X Mail 9.2 \(3112\))


--Apple-Mail=_6CB0B781-9F8C-4721-A5CC-48EBE09BDCB0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

I would like to propose some additions to event that help me get rid of =
two ugly hacks in mod_http2:

1. Initialization of slave connections
   event registers on pre_connection hook and checks if c is a slave =
(c->master) and if the connection state is either not there or the same =
as master (pointer copy). It then sets up a new cs using the slave =
connection pool.

2. Initialization of server config
   event keeps in its private connection state parts the server =
configuration (queues for timeouts and keepalives) that are unique to =
each server because of Timeout and KeepAliveTimeout settings. Normally, =
theses are set on post_read_request hooks which is fine and well. On =
master connections however, these hooks may never get called so the =
server config remains stuck on the connections base server.
   In the case of SNI however, we know which server this connection is =
intended for and should use its Timeouts. This is done by installing an =
early protocol_switch hook that sees connections updates and server_rec =
and initializes its connection state accordingly.

Please vote on the attached patch. I do not want to mess with event =
without having some moral backup...

-Stefan


--Apple-Mail=_6CB0B781-9F8C-4721-A5CC-48EBE09BDCB0
Content-Disposition: attachment;
	filename=event_fix_slaves.patch
Content-Type: application/octet-stream;
	name="event_fix_slaves.patch"
Content-Transfer-Encoding: 7bit

Index: server/mpm/event/event.c
===================================================================
--- server/mpm/event/event.c	(revision 1727544)
+++ server/mpm/event/event.c	(working copy)
@@ -3293,6 +3293,55 @@
     return OK;
 }
 
+static void setup_slave_conn(conn_rec *c, void *csd) 
+{
+    event_conn_state_t *mcs;
+    event_conn_state_t *cs;
+    
+    mcs = ap_get_module_config(c->master->conn_config, &mpm_event_module);
+    
+    cs = apr_pcalloc(c->pool, sizeof(*cs));
+    cs->c = c;
+    cs->r = NULL;
+    cs->sc = mcs->sc;
+    cs->suspended = 0;
+    cs->p = c->pool;
+    cs->bucket_alloc = c->bucket_alloc;
+    cs->pfd = mcs->pfd;
+    cs->pub = mcs->pub;
+    cs->pub.state = CONN_STATE_READ_REQUEST_LINE;
+    cs->pub.sense = CONN_SENSE_DEFAULT;
+    
+    c->cs = &(cs->pub);
+    ap_set_module_config(c->conn_config, &mpm_event_module, cs);
+}
+
+static int event_pre_connection(conn_rec *c, void *csd)
+{
+    if (c->master && (!c->cs || c->cs == c->master->cs)) {
+        setup_slave_conn(c, csd);
+    }
+    return OK;
+}
+
+static int event_protocol_switch(conn_rec *c, request_rec *r, server_rec *s,
+                                 const char *protocol)
+{
+    if (!r && s) {
+        /* connection based switching of protocol, set the correct server
+         * configuration, so that timeouts, keepalives and such are used
+         * for the server that the connection was switched on.
+         * Normally, we set this on post_read_request, but on a protocol
+         * other than http/1.1, this might never happen.
+         */
+        event_conn_state_t *cs;
+        
+        cs = ap_get_module_config(c->conn_config, &mpm_event_module);
+        cs->sc = ap_get_module_config(s->module_config, &mpm_event_module);
+    }
+    return DECLINED;
+}
+
 /* This really should be a post_config hook, but the error log is already
  * redirected by that point, so we need to do this in the open_logs phase.
  */
@@ -3791,6 +3840,9 @@
     ap_hook_post_read_request(event_post_read_request, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_mpm_get_name(event_get_name, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_mpm_resume_suspended(event_resume_suspended, NULL, NULL, APR_HOOK_MIDDLE);
+
+    ap_hook_pre_connection(event_pre_connection, NULL, NULL, APR_HOOK_REALLY_FIRST);
+    ap_hook_protocol_switch(event_protocol_switch, NULL, NULL, APR_HOOK_REALLY_FIRST);
 }
 
 static const char *set_daemons_to_start(cmd_parms *cmd, void *dummy,

--Apple-Mail=_6CB0B781-9F8C-4721-A5CC-48EBE09BDCB0--