httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1374428 - in /httpd/httpd/trunk: CHANGES server/mpm/winnt/mpm_winnt.c
Date Fri, 17 Aug 2012 20:36:10 GMT
Author: trawick
Date: Fri Aug 17 20:36:10 2012
New Revision: 1374428

URL: http://svn.apache.org/viewvc?rev=1374428&view=rev
Log:
Windows: Fix output of -M, -L, and similar command-line options
which display information about the server configuration.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1374428&r1=1374427&r2=1374428&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Aug 17 20:36:10 2012
@@ -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]

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=1374428&r1=1374427&r2=1374428&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Fri Aug 17 20:36:10 2012
@@ -1372,7 +1372,8 @@ static int winnt_pre_config(apr_pool_t *
                      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



Mime
View raw message