From: Jim Jagielski <jim@apache.org>
Date: Mon, 29 Aug 2011 15:20:16 +0000 (+0000)
Subject: PR: 45076
X-Git-Tag: 2.2.20~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc5290528e1c0832d4c1f87e3198d18c38ccd7f0;p=thirdparty%2Fapache%2Fhttpd.git

PR: 45076


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1162854 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 75231f0029f..edceca77a1e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.20
 
-
+  *) core: Do the hook sorting earlier so that the hooks are properly sorted
+     for the pre_config hook and during parsing the config. [Stefan Fritsch] 
 
 Changes with Apache 2.2.19
 
diff --git a/STATUS b/STATUS
index 1c6dcd69d36..6b171843c91 100644
--- a/STATUS
+++ b/STATUS
@@ -92,14 +92,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * Sort hooks before running pre-config hook.
-    Trunk patch: http://svn.apache.org/viewvc?rev=1032002&view=rev
-      (Omit trunk's config*m4 change which adjusted the order of statically
-      linked modules.)
-    PR: 45076
-    2.2.x patch: http://people.apache.org/~trawick/1032002-2.2.x.txt
-    +1: trawick, sf, covener
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/server/main.c b/server/main.c
index b893d2814ea..04ed6c78d47 100644
--- a/server/main.c
+++ b/server/main.c
@@ -633,6 +633,7 @@ int main(int argc, const char * const argv[])
     if (!server_conf) {
         destroy_and_exit_process(process, 1);
     }
+    apr_hook_sort_all();
 
     if (ap_run_pre_config(pconf, plog, ptemp) != OK) {
         ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR, 0,
@@ -645,7 +646,6 @@ int main(int argc, const char * const argv[])
     if (rv == OK) {
         ap_fixup_virtual_hosts(pconf, server_conf);
         ap_fini_vhost_config(pconf, server_conf);
-        apr_hook_sort_all();
 
         if (configtestonly) {
             ap_run_test_config(pconf, server_conf);
@@ -704,6 +704,7 @@ int main(int argc, const char * const argv[])
         if (!server_conf) {
             destroy_and_exit_process(process, 1);
         }
+        apr_hook_sort_all();
 
         if (ap_run_pre_config(pconf, plog, ptemp) != OK) {
             ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR,
@@ -717,7 +718,6 @@ int main(int argc, const char * const argv[])
         }
         ap_fixup_virtual_hosts(pconf, server_conf);
         ap_fini_vhost_config(pconf, server_conf);
-        apr_hook_sort_all();
         apr_pool_clear(plog);
         if (ap_run_open_logs(pconf, plog, ptemp, server_conf) != OK) {
             ap_log_error(APLOG_MARK, APLOG_STARTUP |APLOG_ERR,