Index: CHANGES
===================================================================
--- CHANGES	(revision 1135695)
+++ CHANGES	(working copy)
@@ -1,8 +1,9 @@
                                                          -*- 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
 
   *) Revert ABI breakage in 2.2.18 caused by the function signature change
Index: server/main.c
===================================================================
--- server/main.c	(revision 1135695)
+++ server/main.c	(working copy)
@@ -633,6 +633,7 @@
     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 @@
     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 @@
         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 @@
         }
         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,