Commit 222d4d44 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Tested and voted 


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

STATUS

+4 −4
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
                  http://svn.apache.org/r1814465

     2.4.x patch: http://people.apache.org/~jorton/ap_suexec_jumbo.patch

         or svn merge -c 1341905,1342065,1341930,1345147,1344712,1814465 ^/httpd/httpd/trunk .

     +1: jorton, ylavic,

     +1: jorton, ylavic, jim



  *) mod_ssl: Add "SSLPolicy" directive for Mozilla Security defined protocol settings.

     The change is small, has many revisions since it went back and forth a buit from
@@ -222,7 +222,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     reduces memory footprint and avoids memory exhaustion when transferring large files

     on 32-bit architectures. Fixes PR 62325.

     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2_beam_purge.patch

     +1: icing, ylavic

     +1: icing, ylavic, jim



  *) mod_xml2enc: Fix forwarding of error metadata/responses. PR 62180.

     trunk patch: http://svn.apache.org/r1829038
@@ -235,14 +235,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
  *) mod_http2: Restore keepalive timing of v1.10.16, see https://github.com/icing/mod_h2/issues/160.

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

     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2_keepalive_restore.patch

     +1: icing, ylavic

     +1: icing, ylavic, jim



  *) core: In ONE_PROCESS/debug mode, cleanup everything when exiting.

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

                  http://svn.apache.org/r1830744

     2.4.x patch: svn merge -c 1822537,1830744 ^/httpd/httpd/trunk .

                  (trunk works modulo CHANGES))

     +1: ylavic,

     +1: ylavic, jim



  *) mod_proxy_html: Fix variable interpolation and memory allocation failure

     in ProxyHTMLURLMap. PR 62344.