You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2012/08/21 19:37:50 UTC
svn commit: r1375680 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
server/main.c
Author: wrowe
Date: Tue Aug 21 17:37:50 2012
New Revision: 1375680
URL: http://svn.apache.org/viewvc?rev=1375680&view=rev
Log:
* server/main.c (main): Bail out *before* signalling the server
if the config is bad. (as per the claim in the docs!)
Backports: r1328345
Submitted by: jorton
Reviewed by: rjung, trawick, wrowe
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/server/main.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1375680&r1=1375679&r2=1375680&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Aug 21 17:37:50 2012
@@ -10,6 +10,9 @@ Changes with Apache 2.2.23
possible XSS for a site where untrusted users can upload files to
a location with MultiViews enabled. [Niels Heinen <heinenn google.com>]
+ *) core: Prevent "httpd -k restart" from killing server in presence of
+ config error. [Joe Orton]
+
*) mod_ssl: when compiled against OpenSSL 1.0.1 or later, allow explicit
control of TLSv1.1 and TLSv1.2 through the SSLProtocol directive,
adding TLSv1.1 and TLSv1.2 support by default given 'SSLProtocol All'.
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1375680&r1=1375679&r2=1375680&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Aug 21 17:37:50 2012
@@ -122,14 +122,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.2.x patch: trunk patch applies
+1: rjung, trawick, wrowe
- * core: Bail out *before* signalling the server if the config is bad.
- (as per the claim in the docs!) Prevents "httpd -k restart" from
- killing server in presence of config error.
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1328345
- 2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1331847
- 2.2.x patch: trunk patch applies
- +1: rjung, trawick, wrowe
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/main.c?rev=1375680&r1=1375679&r2=1375680&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/main.c (original)
+++ httpd/httpd/branches/2.2.x/server/main.c Tue Aug 21 17:37:50 2012
@@ -661,6 +661,11 @@ int main(int argc, const char * const ar
}
}
+ /* If our config failed, deal with that here. */
+ if (rv != OK) {
+ destroy_and_exit_process(process, 1);
+ }
+
signal_server = APR_RETRIEVE_OPTIONAL_FN(ap_signal_server);
if (signal_server) {
int exit_status;
@@ -670,11 +675,6 @@ int main(int argc, const char * const ar
}
}
- /* If our config failed, deal with that here. */
- if (rv != OK) {
- destroy_and_exit_process(process, 1);
- }
-
apr_pool_clear(plog);
if ( ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) {