You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2014/06/08 00:24:59 UTC
svn commit: r1601171 - in /httpd/httpd/trunk/server/mpm: event/event.c
eventopt/eventopt.c
Author: ylavic
Date: Sat Jun 7 22:24:59 2014
New Revision: 1601171
URL: http://svn.apache.org/r1601171
Log:
-MPMs event & eventopt: child listeners are used in ONE_PROCESS mode too.
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm/eventopt/eventopt.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=1601171&r1=1601170&r2=1601171&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Sat Jun 7 22:24:59 2014
@@ -2607,6 +2607,9 @@ static int make_child(server_rec * s, in
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, in
/* 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");
Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1601171&r1=1601170&r2=1601171&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
+++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Sat Jun 7 22:24:59 2014
@@ -2418,6 +2418,9 @@ static int make_child(server_rec * s, in
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, in
/* 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");