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 2016/03/01 14:38:19 UTC
svn commit: r1733064 - in /httpd/httpd/trunk/server/mpm: event/event.c
worker/worker.c
Author: ylavic
Date: Tue Mar 1 13:38:18 2016
New Revision: 1733064
URL: http://svn.apache.org/viewvc?rev=1733064&view=rev
Log:
Revert changes on mpm_event and mpm_worker from r1711479.
The POD is not used in one process mode for those MPMs.
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm/worker/worker.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=1733064&r1=1733063&r2=1733064&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Tue Mar 1 13:38:18 2016
@@ -3365,7 +3365,8 @@ static int event_open_logs(apr_pool_t *
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");
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=1733064&r1=1733063&r2=1733064&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Tue Mar 1 13:38:18 2016
@@ -2053,7 +2053,8 @@ static int worker_open_logs(apr_pool_t *
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");