You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2012/09/18 03:54:55 UTC
svn commit: r1386956 - in /httpd/httpd: branches/2.4.x/CHANGES
branches/2.4.x/STATUS branches/2.4.x/server/mpm/winnt/mpm_winnt.c
trunk/CHANGES
Author: fuankg
Date: Tue Sep 18 01:54:54 2012
New Revision: 1386956
URL: http://svn.apache.org/viewvc?rev=1386956&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c
httpd/httpd/trunk/CHANGES
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1386956&r1=1386955&r2=1386956&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Sep 18 01:54:54 2012
@@ -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
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1386956&r1=1386955&r2=1386956&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Sep 18 01:54:54 2012
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c?rev=1386956&r1=1386955&r2=1386956&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/mpm_winnt.c Tue Sep 18 01:54:54 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
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1386956&r1=1386955&r2=1386956&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Sep 18 01:54:54 2012
@@ -17,10 +17,6 @@ Changes with Apache 2.5.0
to allow tracking of threads from exiting children via mod_status
or other such mechanisms. [Jeff Trawick]
- *) 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]