]> granicus.if.org Git - apache/commit
Merge r1560683 and r1581011 from trunk:
authorTakashi Sato <takashi@apache.org>
Thu, 29 May 2014 12:55:59 +0000 (12:55 +0000)
committerTakashi Sato <takashi@apache.org>
Thu, 29 May 2014 12:55:59 +0000 (12:55 +0000)
commit5f5ceb6f541a516c6d705dbdae5d917881db29be
treec5df9ecc187c5aacdd2c6b029a36473dc298a10e
parenta9a5eac0e0d157585b38684760ac9a5d995e4152
Merge r1560683 and r1581011 from trunk:

(mod/mod_proxy_express.xml)
It does more than just a ProxyPass, but also looks at the HOST header,
so this gives somewhat deeper insight into what the end result looks
like.

(mod/mod_proxy_connect.xml)
a comma leaked onto the page

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1598284 13f79535-47bb-0310-9956-ffa450edef68
docs/manual/mod/mod_proxy_connect.xml
docs/manual/mod/mod_proxy_express.xml