You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/07/09 18:36:24 UTC

svn commit: r1501370 - in /httpd/httpd/branches/2.4.x: ./ modules/proxy/mod_proxy_balancer.c

Author: jim
Date: Tue Jul  9 16:36:24 2013
New Revision: 1501370

URL: http://svn.apache.org/r1501370
Log:
Merge r1501369 from trunk:

Ensure balancer runs after proxy for mutex creation

Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1501369

Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c?rev=1501370&r1=1501369&r2=1501370&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c Tue Jul  9 16:36:24 2013
@@ -1686,8 +1686,9 @@ static void ap_proxy_balancer_register_h
      * 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);



Re: svn commit: r1501370 - in /httpd/httpd/branches/2.4.x: ./ modules/proxy/mod_proxy_balancer.c

Posted by Ruediger Pluem <rp...@apache.org>.

jim@apache.org wrote:
> Author: jim
> Date: Tue Jul  9 16:36:24 2013
> New Revision: 1501370
>
> URL: http://svn.apache.org/r1501370
> Log:
> Merge r1501369 from trunk:
>
> Ensure balancer runs after proxy for mutex creation
>
> Reviewed/backported by: jim
>
> Modified:
>      httpd/httpd/branches/2.4.x/   (props changed)
>      httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c

Just to be sure: Did I miss a vote on this?

Regards

RĂ¼diger