Commit 3df46d11 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

promote



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1838849 13f79535-47bb-0310-9956-ffa450edef68
parent 4cd4292b
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -138,6 +138,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: svn merge -c 1801144,1801148,1801456 ^/httpd/httpd/trunk . 
     +1: jailletc36, jim (via inspection), wrowe

   *) mod_ratelimit: Run after the chunking filter so headers are always sent
      uninterrupted., pass EOS to each downstream filter. 
      Fixes regression in 2.4.34.
      trunk patch: http://svn.apache.org/r1837130
      2.4.x patch: svn merge -c 1837130 ^/httpd/httpd/trunk .
      +1: covener, ylavic, jim


PATCHES PROPOSED TO BACKPORT FROM TRUNK:
  [ New proposals should be added at the end of the list ]
@@ -221,13 +228,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   (adjust CHANGES and include/ap_mmn.h)
      +1: rjung, jim

   *) mod_ratelimit: Run after the chunking filter so headers are always sent
      uninterrupted., pass EOS to each downstream filter. 
      Fixes regression in 2.4.34.
      trunk patch: http://svn.apache.org/r1837130
      2.4.x patch: svn merge -c 1837130 ^/httpd/httpd/trunk .
      +1: covener, ylavic, jim

   *) mod_proxy: fix load order dep between mod_proxy and lbmethod providers
      trunk patch: http://svn.apache.org/r1836381 
                   http://svn.apache.org/r1836382