Revert changes on mpm_event and mpm_worker from r1711479.

The POD is not used in one process mode for those MPMs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733064 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 8fa179f44014f42881a8f63b25711c7572f4c084..cef22e63309d36ccc07069bf868c5c447a3f3d07 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -3365,7 +3365,8 @@ static int event_open_logs(apr_pool_t * p, apr_pool_t * plog,
 
     all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets));
     for (i = 0; i < num_buckets; i++) {
-        if ((rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod))) {
+        if (!one_process && /* no POD in one_process mode */
+                (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod))) {
             ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
                          (startup ? NULL : s), APLOGNO(03274)
                          "could not open pipe-of-death");

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 0898f248e829e7dea1fe290d85a1835c3330de6a..564641a3e2af2891b0da2db041bafea8616d869e 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -2053,7 +2053,8 @@ static int worker_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
 
     all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets));
     for (i = 0; i < num_buckets; i++) {
-        if ((rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod))) {
+        if (!one_process && /* no POD in one_process mode */
+                (rv = ap_mpm_podx_open(pconf, &all_buckets[i].pod))) {
             ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
                          (startup ? NULL : s), APLOGNO(03292)
                          "could not open pipe-of-death");