Commit 399f9967 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

promote 3 backports



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834839 13f79535-47bb-0310-9956-ffa450edef68
parent 9f222c76
Loading
Loading
Loading
Loading
+22 −22
Original line number Diff line number Diff line
@@ -141,28 +141,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
  [ start all new proposals below, under PATCHES PROPOSED. ]


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

  *) core: Allow mod_env to override all system path envvars not just PATH
     trunk patch: http://svn.apache.org/r1811831
     2.4.x patch: svn merge -c 1811831 ^/httpd/httpd/trunk .
     +1: jorton, rpluem
     ylavic: same as dev@; since SetEnv* are usable from htaccess, wouldn't
             we open a door here (unconditionally)?

  *) mod_proxy: Fix a corner case where the ProxyPassReverseCookieDomain or
     ProxyPassReverseCookiePath directive could fail to update correctly 
     'domain=' or 'path=' in the 'Set-Cookie' header.  PR 61560.
     trunk patch: http://svn.apache.org/r1832280
     2.4.x patch: trunk works (module CHANGES)
                  svn merge -c 1832280 ^/httpd/httpd/trunk . 
     +1: jailletc36, rpluem
     jailletc36: 'ap_proxy_strmatch_domain' and 'ap_proxy_strmatch_path' are
     now useless.  They could be axed, but maybe, not in 2.4.x (even if I
     don't imagine any 3rd party proxy module to use it)

  *) Add ru, zh-cn and zh-tw translations of errordocs.
     trunk patch: http://svn.apache.org/r1817175
                  http://svn.apache.org/r1831800
@@ -193,6 +171,28 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: svn merge -c 1795834,1828912,1830943,1830944,1832991 ^/httpd/httpd/trunk . 
     +1: jailletc36, covener, jim


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

  *) core: Allow mod_env to override all system path envvars not just PATH
     trunk patch: http://svn.apache.org/r1811831
     2.4.x patch: svn merge -c 1811831 ^/httpd/httpd/trunk .
     +1: jorton, rpluem
     ylavic: same as dev@; since SetEnv* are usable from htaccess, wouldn't
             we open a door here (unconditionally)?

  *) mod_proxy: Fix a corner case where the ProxyPassReverseCookieDomain or
     ProxyPassReverseCookiePath directive could fail to update correctly 
     'domain=' or 'path=' in the 'Set-Cookie' header.  PR 61560.
     trunk patch: http://svn.apache.org/r1832280
     2.4.x patch: trunk works (module CHANGES)
                  svn merge -c 1832280 ^/httpd/httpd/trunk . 
     +1: jailletc36, rpluem
     jailletc36: 'ap_proxy_strmatch_domain' and 'ap_proxy_strmatch_path' are
     now useless.  They could be axed, but maybe, not in 2.4.x (even if I
     don't imagine any 3rd party proxy module to use it)

  *) mod_ratelimit: fix behavior with proxied content
     trunk patch: http://svn.apache.org/r1833875
     2.4.x patch: svn merge -c 1833875 ^/httpd/httpd/trunk .