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 30A6C11017 for ; Sat, 7 Jun 2014 22:25:21 +0000 (UTC) Received: (qmail 17440 invoked by uid 500); 7 Jun 2014 22:25:20 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 17382 invoked by uid 500); 7 Jun 2014 22:25:20 -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 17375 invoked by uid 99); 7 Jun 2014 22:25:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jun 2014 22:25:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jun 2014 22:25:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A4FA923888D2; Sat, 7 Jun 2014 22:24:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1601171 - in /httpd/httpd/trunk/server/mpm: event/event.c eventopt/eventopt.c Date: Sat, 07 Jun 2014 22:24:59 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140607222459.A4FA923888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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");