sf at apache
Apr 28, 2012, 3:56 PM
Post #1 of 1
(36 views)
Permalink
|
|
svn commit: r1331847 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS server/main.c
|
|
Author: sf
Date: Sat Apr 28 22:56:20 2012
New Revision: 1331847
URL: http://svn.apache.org/viewvc?rev=1331847&view=rev
Log:
Merge 1328345, add CHANGES entry:
* server/main.c (main): Bail out *before* signalling the server
if the config is bad. (as per the claim in the docs!)
Submitted by: jorton
Reviewed by: jorton, jim, sf
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/main.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1328345
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1331847&r1=1331846&r2=1331847&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Apr 28 22:56:20 2012
@@ -3,6 +3,9 @@
Changes with Apache 2.4.3
+ *) core: Prevent "httpd -k restart" from killing server in presence of
+ config error. [Joe Orton]
+
*) mod_proxy_fcgi: If there is an error reading the headers from the
backend, send an error to the client. PR 52879. [Stefan Fritsch]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1331847&r1=1331846&r2=1331847&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Apr 28 22:56:20 2012
@@ -95,11 +95,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4 patch: Trunk patch works
+1: rbowen, jim, sf
- * core: Prevent "httpd -k restart" from killing server in presence of config error.
- trunk patch: http://svn.apache.org/viewvc?rev=1328345&view=rev
- 2.4 patch: trunk patch works
- +1: jorton, jim, sf
-
* mod_sed, mod_log_debug: Symbol namespace cleanups.
trunk patches: http://svn.apache.org/viewvc?rev=1326980&view=rev
http://svn.apache.org/viewvc?rev=1326984&view=rev
Modified: httpd/httpd/branches/2.4.x/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/main.c?rev=1331847&r1=1331846&r2=1331847&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/main.c (original)
+++ httpd/httpd/branches/2.4.x/server/main.c Sat Apr 28 22:56:20 2012
@@ -671,6 +671,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;
@@ -680,11 +685,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, ap_server_conf) != OK) {
|
