From: Guenter Knauf <fuankg@apache.org>
Date: Tue, 18 Sep 2012 01:54:54 +0000 (+0000)
Subject: Windows: Fix output of -M, -L, and similar command-line options
X-Git-Tag: 2.4.4~598
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32e977b2e13af0e582a0c1fa99301e152aefc348;p=apache

Windows: Fix output of -M, -L, and similar command-line options
which display information about the server configuration (backport r1374428).
Submitted by: trawick
Reviewed/backported by: gsmith, fuankg


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1386956 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 182b15dda7..6f81b343d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.4
 
+  *) Windows: Fix output of -M, -L, and similar command-line options
+     which display information about the server configuration.
+     [Jeff Trawick]
+
 
 Changes with Apache 2.4.3
 
diff --git a/STATUS b/STATUS
index 865e30e5f1..b597cf23d9 100644
--- a/STATUS
+++ b/STATUS
@@ -89,12 +89,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * Windows: Fix output of -M, -L, and similar command-line options
-     which display information about the server configuration.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1374428
-     2.4.x patch: trunk patch works.
-     +1: trawick, gsmith, fuankg
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 4f6f8fe550..3ce8e14453 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1372,7 +1372,8 @@ static int winnt_pre_config(apr_pool_t *pconf_, apr_pool_t *plog, apr_pool_t *pt
                      service_name);
         exit(APEXIT_INIT);
     }
-    else if (!one_process && !my_generation) {
+    else if (ap_state_query(AP_SQ_RUN_MODE) == AP_SQ_RM_NORMAL
+             && !one_process && !my_generation) {
         /* Open a null handle to soak stdout in this process.
          * We need to emulate apr_proc_detach, unix performs this
          * same check in the pre_config hook (although it is