]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ba0bae4) | patch
Merge 1805099 from trunk:
authorJoe Orton <jorton@apache.org>
Fri, 18 Aug 2017 08:49:42 +0000 (08:49 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 18 Aug 2017 08:49:42 +0000 (08:49 +0000)
commit46b25893563c667aaa04f20f7ac0b191fd281fe0
tree13a81cb4429ef673b53522d9408f86eaf369a7detree | snapshot
parentba0bae43be65b5b02d42234aa0dcced271514febcommit | diff
Merge 1805099 from trunk:

Fix ProxyAddHeaders merging.

* modules/proxy/mod_proxy.h:
  Add add_forwarded_headers_set field to proxy_dir_conf.

* modules/proxy/mod_proxy.c (create_proxy_dir_config):
  Initialize add_forwarded_headers_set.
  (add_proxy_http_headers): Set it.
  (merge_proxy_dir_config): Merge add_forwarded_headers correctly.

Reviewed by: jorton, rpluem, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1805390 13f79535-47bb-0310-9956-ffa450edef68
CHANGES 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.