Commit 762cc91f authored by Joe Orton's avatar Joe Orton
Browse files

Merged. 

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

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -222,11 +222,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     2.4.x patch: svn merge -c 1803420,1803454,1804090 ^/httpd/httpd/trunk .

     +1: icing +1: steffenal



  *) mod_proxy: fix ProxyAddHeaders merging.

     trunk patch: http://svn.apache.org/viewvc?rev=1805099&view=rev

     2.4.x patch: trunk patch works

     +1: jorton, rpluem, jim



  *) mod_watchdog/mod_proxy_hcheck: Now accept ms interval settings

     trunk patch: http://svn.apache.org/r1799435

                  http://svn.apache.org/r1799437