From: Yann Ylavic <ylavic@apache.org>
Date: Tue, 1 Mar 2016 13:38:18 +0000 (+0000)
Subject: Revert changes on mpm_event and mpm_worker from r1711479.
X-Git-Tag: 2.5.0-alpha~1981
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43d45b073d186cb18f0e6d5d16320464644bd948;p=apache

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 8fa179f440..cef22e6330 100644
--- 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 0898f248e8..564641a3e2 100644
--- 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");