Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 91733 invoked by uid 500); 11 Feb 2002 15:40:08 -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 91722 invoked by uid 500); 11 Feb 2002 15:40:08 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 11 Feb 2002 15:40:08 -0000 Message-ID: <20020211154008.63246.qmail@icarus.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-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N stoddard 02/02/11 07:40:08 Modified: . CHANGES server/mpm/winnt mpm_winnt.c Log: Make apache -k shutdown an alias for apache -k stop. "shutdown" maintained for backward compatability. Revision Changes Path 1.575 +3 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.574 retrieving revision 1.575 diff -u -r1.574 -r1.575 --- CHANGES 11 Feb 2002 15:24:45 -0000 1.574 +++ CHANGES 11 Feb 2002 15:40:07 -0000 1.575 @@ -1,4 +1,7 @@ Changes with Apache 2.0.32-dev + *) Win32: apache -k shutdown now behaves like apache -k stop. + [Bill Stoddard] + *) Win32: Get apache -k restart -n apache2 working reliabily again. [Bill Stoddard] 1.231 +3 -1 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.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- mpm_winnt.c 11 Feb 2002 15:24:46 -0000 1.230 +++ mpm_winnt.c 11 Feb 2002 15:40:07 -0000 1.231 @@ -2110,6 +2110,7 @@ * -k runservice [WinNT errors logged from rewrite_args] * -k uninstall * -k stop + * -k shutdown (same as -k stop). Maintained for backward compatability. * * in these cases we -don't- care if httpd.conf has config errors! */ @@ -2133,7 +2134,8 @@ exit(rv); } - if (!strcasecmp(signal_arg, "stop")) { + if ((!strcasecmp(signal_arg, "stop")) || + (!strcasecmp(signal_arg, "shutdown"))) { mpm_signal_service(ptemp, 0); exit(0); }