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 182b15dda71c10dfbf63f433512a99a5555a006a..6f81b343d5517999c3fd4c79e777209c995e3c86 100644 (file)
--- 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 865e30e5f154ecd0b4516a0928ad732dd23e0107..b597cf23d9d1f6c6e32caf46a50ccab7c409285a 100644 (file)
--- 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 4f6f8fe550ea7f75d9a435915a0406f8de30fdb6..3ce8e14453d3c77fa705e9238eca09c30e86fafc 100644 (file)
--- 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