From: Jim Jagielski <jim@apache.org>
Date: Tue, 9 Jul 2013 16:36:24 +0000 (+0000)
Subject: Merge r1501369 from trunk:
X-Git-Tag: 2.4.5~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df37ba725ae9c11b617b4739a5c6f4001abe8a8f;p=apache

Merge r1501369 from trunk:

Ensure balancer runs after proxy for mutex creation

Reviewed/backported by: jim


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

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 1e215126b4..177de5a2f2 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -1686,8 +1686,9 @@ static void ap_proxy_balancer_register_hook(apr_pool_t *p)
      * initializes
      */
     static const char *const aszPred[] = { "mpm_winnt.c", "mod_slotmem_shm.c", NULL};
+    static const char *const aszPred2[] = { "mod_proxy.c", NULL};
      /* manager handler */
-    ap_hook_post_config(balancer_post_config, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_post_config(balancer_post_config, aszPred2, NULL, APR_HOOK_MIDDLE);
     ap_hook_pre_config(balancer_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_handler(balancer_handler, NULL, NULL, APR_HOOK_FIRST);
     ap_hook_child_init(balancer_child_init, aszPred, NULL, APR_HOOK_MIDDLE);