From: Yann Ylavic <ylavic@apache.org> Date: Sat, 7 Jun 2014 22:24:59 +0000 (+0000) Subject: -MPMs event & eventopt: child listeners are used in ONE_PROCESS mode too. X-Git-Tag: 2.5.0-alpha~4098 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=899a843490267098dd033fdd41c4ffbfda297c32;p=apache -MPMs event & eventopt: child listeners are used in ONE_PROCESS mode too. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601171 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c index 2a7455af02..c937b319f8 100644 --- a/server/mpm/event/event.c +++ b/server/mpm/event/event.c @@ -2607,6 +2607,9 @@ static int make_child(server_rec * s, int slot) retained->max_daemons_limit = slot + 1; } + child_listen = mpm_listen[bucket[slot]]; + child_pod = pod[bucket[slot]]; + if (one_process) { set_signals(); event_note_child_started(slot, getpid()); @@ -2614,9 +2617,6 @@ static int make_child(server_rec * s, int slot) /* NOTREACHED */ } - child_listen = mpm_listen[bucket[slot]]; - child_pod = pod[bucket[slot]]; - if ((pid = fork()) == -1) { ap_log_error(APLOG_MARK, APLOG_ERR, errno, s, APLOGNO(00481) "fork: Unable to fork new process"); diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c index 6cd24e283a..4d3794a927 100644 --- a/server/mpm/eventopt/eventopt.c +++ b/server/mpm/eventopt/eventopt.c @@ -2418,6 +2418,9 @@ static int make_child(server_rec * s, int slot) retained->max_daemons_limit = slot + 1; } + child_listen = mpm_listen[bucket[slot]]; + child_pod = pod[bucket[slot]]; + if (one_process) { set_signals(); event_note_child_started(slot, getpid()); @@ -2425,9 +2428,6 @@ static int make_child(server_rec * s, int slot) /* NOTREACHED */ } - child_listen = mpm_listen[bucket[slot]]; - child_pod = pod[bucket[slot]]; - if ((pid = fork()) == -1) { ap_log_error(APLOG_MARK, APLOG_ERR, errno, s, APLOGNO(00481) "fork: Unable to fork new process");