Commit 17d2298e authored by Jim Jagielski's avatar Jim Jagielski
Browse files

update patch 


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

STATUS

+2 −1
Original line number Original line Diff line number Diff line
@@ -195,7 +195,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
  *) modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files

  *) modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files

     a non-fatal warning/error under maintainer-mode.

     a non-fatal warning/error under maintainer-mode.

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

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

     2.4.x patch: svn merge -c 1850745 ^/httpd/httpd/trunk .

                  http://svn.apache.org/r1855446

     2.4.x patch: svn merge -c 1850745,1855446 ^/httpd/httpd/trunk .

     +1: jim

     +1: jim





  *) mod_proxy_http: forward 100-continue, and minimize race conditions when

  *) mod_proxy_http: forward 100-continue, and minimize race conditions when