Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AAD96181FF for ; Tue, 1 Mar 2016 13:38:22 +0000 (UTC) Received: (qmail 21607 invoked by uid 500); 1 Mar 2016 13:38:22 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 21446 invoked by uid 500); 1 Mar 2016 13:38:22 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 21437 invoked by uid 99); 1 Mar 2016 13:38:22 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2016 13:38:22 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id DCFA1C0E25 for ; Tue, 1 Mar 2016 13:38:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.471 X-Spam-Level: * X-Spam-Status: No, score=1.471 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id xsOgEESNGefL for ; Tue, 1 Mar 2016 13:38:21 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 628795FBED for ; Tue, 1 Mar 2016 13:38:20 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 402DFE0678 for ; Tue, 1 Mar 2016 13:38:19 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 3A9203A024F for ; Tue, 1 Mar 2016 13:38:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1733064 - in /httpd/httpd/trunk/server/mpm: event/event.c worker/worker.c Date: Tue, 01 Mar 2016 13:38:19 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160301133819.3A9203A024F@svn01-us-west.apache.org> 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");