Commit c22ce8fe authored by Stefan Eissing's avatar Stefan Eissing
Browse files

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1856929 13f79535-47bb-0310-9956-ffa450edef68
parent 83de0b37
Loading
Loading
Loading
Loading
+6 −7
Original line number Diff line number Diff line
@@ -133,6 +133,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: svn merge -c 1856297 ^/httpd/httpd/trunk .
     +1: icing, jim, ylavic

  *) modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files
     a non-fatal warning/error under maintainer-mode.
     trunk patch: http://svn.apache.org/r1850745
                  http://svn.apache.org/r1855446
     2.4.x patch: svn merge -c 1850745,1855446 ^/httpd/httpd/trunk .
     +1: jim, covener, icing

PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ New proposals should be added at the end of the list ]
@@ -183,13 +189,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     jailletc36: at least, r1853302 is required, IMHO
     minfrin: r1853302 is added in above, resetting jim's vote

  *) modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files
     a non-fatal warning/error under maintainer-mode.
     trunk patch: http://svn.apache.org/r1850745
                  http://svn.apache.org/r1855446
     2.4.x patch: svn merge -c 1850745,1855446 ^/httpd/httpd/trunk .
     +1: jim, covener

  *) mod_proxy_http: forward 100-continue, and minimize race conditions when
     reusing backend connections. PR 60330.
     trunk patch: http://svn.apache.org/r1656259