]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f3a4f35) | patch
Merge r1667707, r1824332 from trunk:
authorYann Ylavic <ylavic@apache.org>
Thu, 15 Feb 2018 17:27:31 +0000 (17:27 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 15 Feb 2018 17:27:31 +0000 (17:27 +0000)
commitfd2e91e8570f628e50fde630b962215ce47362a2
treed6ed36b6347a242d00fc5fba9647be2c17405a64tree | snapshot
parentf3a4f3546353aa77405af4c40fcde795b2e946d7commit | diff
Merge r1667707, r1824332 from trunk:

* mod_proxy: Allow setting options to globally defined balancer from
  ProxyPass used in VirtualHost. Balancers are now merged using the new
  merge_balancers method which merges the balancers options.

mod_proxy: follow up to r1667707: MMN minor bump.

Submitted by: jkaluza, ylavic
Reviewed by: icing, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824333 13f79535-47bb-0310-9956-ffa450edef68
CHANGES diff | blob | history
include/ap_mmn.h diff | blob | history
modules/proxy/mod_proxy.c diff | blob | history
modules/proxy/mod_proxy.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.