Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 78884 invoked from network); 25 Aug 2004 14:47:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 25 Aug 2004 14:47:24 -0000 Received: (qmail 79303 invoked by uid 500); 25 Aug 2004 14:47:23 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 79126 invoked by uid 500); 25 Aug 2004 14:47: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: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 79113 invoked by uid 500); 25 Aug 2004 14:47:20 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 79106 invoked by uid 99); 25 Aug 2004 14:47:20 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Wed, 25 Aug 2004 07:47:19 -0700 Received: (qmail 78756 invoked by uid 1088); 25 Aug 2004 14:47:18 -0000 Date: 25 Aug 2004 14:47:18 -0000 Message-ID: <20040825144718.78755.qmail@minotaur.apache.org> From: stoddard@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N stoddard 2004/08/25 07:47:18 Modified: . CHANGES server/mpm/winnt mpm_winnt.c Log: Win32: Fix stranded piped loggers on apache -k start,restart,config,install Revision Changes Path 1.1565 +4 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.1564 retrieving revision 1.1565 diff -u -r1.1564 -r1.1565 --- CHANGES 23 Aug 2004 20:53:22 -0000 1.1564 +++ CHANGES 25 Aug 2004 14:47:17 -0000 1.1565 @@ -1,6 +1,10 @@ Changes with Apache 2.1.0-dev [Remove entries to the current 2.0 section below, when backported] + *) Win32: apache -k start|restart|install|config can leave stranded + piped logger processes (eg, rotatelogs.exe) due to improper + server shutdown on these code paths. + [Bill Stoddard] *) Restructured mod_auth_ldap to fit the new authentication model. The module is now called authnz_ldap and has been moved out of 1.312 +8 -0 httpd-2.0/server/mpm/winnt/mpm_winnt.c Index: mpm_winnt.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- mpm_winnt.c 24 Apr 2004 11:23:14 -0000 1.311 +++ mpm_winnt.c 25 Aug 2004 14:47:18 -0000 1.312 @@ -1409,10 +1409,14 @@ if (!strcasecmp(signal_arg, "install")) { rv = mpm_service_install(ptemp, inst_argc, inst_argv, 0); + apr_pool_destroy(s->process->pool); + apr_terminate(); exit (rv); } if (!strcasecmp(signal_arg, "config")) { rv = mpm_service_install(ptemp, inst_argc, inst_argv, 1); + apr_pool_destroy(s->process->pool); + apr_terminate(); exit (rv); } @@ -1425,11 +1429,15 @@ lr->active = 0; } rv = mpm_service_start(ptemp, inst_argc, inst_argv); + apr_pool_destroy(s->process->pool); + apr_terminate(); exit (rv); } if (!strcasecmp(signal_arg, "restart")) { mpm_signal_service(ptemp, 1); + apr_pool_destroy(s->process->pool); + apr_terminate(); exit (rv); }