Commit 10ad6d2d authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810231 13f79535-47bb-0310-9956-ffa450edef68
parent 9babfbc4
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -122,6 +122,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: svn merge -c 1809209 ^/httpd/httpd/trunk .
     +1: jailletc36 (by inspection), ylavic, elukey

   *) mod_http2: Fix race condition on request body handlign.
      2.4.x patch: svn merge -c 1804096,1807238,1809981,1810088,1810089 ^/httpd/httpd/trunk .
      +1: icing, steffenal, ylavic
      ylavic: Not sure about MOD_HTTP2_VERSION[_NUM] from the above merge.
              Shouldn't it be 1.10.11 instead of 1.10.12-DEV?


PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ New proposals should be added at the end of the list ]

@@ -190,10 +197,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1798785 ^/httpd/httpd/trunk .
     +1: jailletc36, ylavic

   *) mod_http2: Fix race condition on request body handlign.
      2.4.x patch: svn merge -c 1804096,1807238,1809981,1810088,1810089 ^/httpd/httpd/trunk .
      +1: icing, steffenal

   *) mod_rewrite,core: Avoid the 'Vary: Host' response header when HTTP_HOST
                        is used in a condition that evaluates to true.
      trunk patch: http://svn.apache.org/r1808746