You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/01/29 16:51:25 UTC
svn commit: r1727603 - in /httpd/httpd/trunk: CHANGES
server/mpm/event/event.c
Author: icing
Date: Fri Jan 29 15:51:25 2016
New Revision: 1727603
URL: http://svn.apache.org/viewvc?rev=1727603&view=rev
Log:
event: slave connection init, vhost early config
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/server/mpm/event/event.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1727603&r1=1727602&r2=1727603&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Jan 29 15:51:25 2016
@@ -1,6 +1,11 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) event: use pre_connection hook to properly initialize connection state for
+ slave connections. use protocol_switch hook to initialize server config
+ early based on SNI selected vhost.
+ [Stefan Eissing]
+
*) mod_http2: allowing link header to specify multiple "rel" values,
space-separated inside a quoted string. Prohibiting push when Link parameter
"nopush" is present.
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1727603&r1=1727602&r2=1727603&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Fri Jan 29 15:51:25 2016
@@ -3293,6 +3293,55 @@ static int event_run(apr_pool_t * _pconf
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 @@ static void event_hooks(apr_pool_t * p)
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,
Re: svn commit: r1727603 - in /httpd/httpd/trunk: CHANGES server/mpm/event/event.c
Posted by Yann Ylavic <yl...@gmail.com>.
On Wed, Mar 2, 2016 at 12:59 AM, Yann Ylavic <yl...@gmail.com> wrote:
> On Fri, Jan 29, 2016 at 4:51 PM, <ic...@apache.org> wrote:
>>
>> +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;
>
> Can the slave connection really have the same bucket_alloc as the master?
> Can't both be processed (i.e. process_socket) at the same time?
Forget that, I have read it as: cs->bucket_alloc = mcs->bucket_alloc :p
Re: svn commit: r1727603 - in /httpd/httpd/trunk: CHANGES server/mpm/event/event.c
Posted by Yann Ylavic <yl...@gmail.com>.
On Fri, Jan 29, 2016 at 4:51 PM, <ic...@apache.org> wrote:
> Author: icing
> Date: Fri Jan 29 15:51:25 2016
> New Revision: 1727603
>
> URL: http://svn.apache.org/viewvc?rev=1727603&view=rev
> Log:
> event: slave connection init, vhost early config
>
> Modified:
> httpd/httpd/trunk/server/mpm/event/event.c
[]
>
> Modified: httpd/httpd/trunk/server/mpm/event/event.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1727603&r1=1727602&r2=1727603&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/mpm/event/event.c (original)
> +++ httpd/httpd/trunk/server/mpm/event/event.c Fri Jan 29 15:51:25 2016
> @@ -3293,6 +3293,55 @@ static int event_run(apr_pool_t * _pconf
> 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;
Can the slave connection really have the same bucket_alloc as the master?
Can't both be processed (i.e. process_socket) at the same time?
> + cs->pfd = mcs->pfd;
> + cs->pub = mcs->pub;
Looks unnecessary, since the two pub's (only) fields below are overwritten.
> + 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);
> +}
Regards,
Yann.