From: Jeff Trawick <trawick@apache.org>
Date: Fri, 17 Aug 2012 20:36:10 +0000 (+0000)
Subject: Windows: Fix output of -M, -L, and similar command-line options
X-Git-Tag: 2.5.0-alpha~6414
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb6a888ee5f47096f7882eaf860c6a83b172a72d;p=apache

Windows: Fix output of -M, -L, and similar command-line options
which display information about the server configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1374428 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 4264970d69..b3fb254d5b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) Windows: Fix output of -M, -L, and similar command-line options
+     which display information about the server configuration.
+     [Jeff Trawick]
+
   *) mod_ssl: Catch missing or mismatched client cert/key pairs with
      SSLProxyMachineCertificateFile/Path directives.  PR 52212.  
      [Keith Burdis <keith burdis.org>, Joe Orton]
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