Commit c911cbf6 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@1725503 13f79535-47bb-0310-9956-ffa450edef68
parent b5b5f3c5

STATUS

+39 −39
Original line number Diff line number Diff line
@@ -112,6 +112,45 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) core: Save memory when calling 'ap_parse_htaccess'

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

     2.4.x patch: trunk works

     +1: jailletc36, covener, jim



  *) Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order

     to save a few cycles.

     Fix some style issues.

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

                  http://svn.apache.org/r1719189

                  http://svn.apache.org/r1719190

     2.4.x patch: trunk works

     +1: jailletc36, covener, jim



  *) mod_negotiation: Use 'ap_array_str_contains' to simplify code.

     core: likewise

     http: likewise

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

                  http://svn.apache.org/r1719254

                  http://svn.apache.org/r1719255

                  http://svn.apache.org/r1720996 (change in ap_method_in_list not

                                                  tested, it is not actually used)

     2.4.x patch: trunk works

     +1: jailletc36, covener, jim



  *) mod_mod_authn_socache: Do not use the magic string "directory". Use the

     corresponding global variable as in all other places of the module.

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

     2.4.x patch: trunk works

     +1: jailletc36, covener, jim



  *) mime.types: Add common extension "m4a" for MPEG 4 Audio.

     As a reference see Wikipedia:

     https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A

     PR: 57895

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

     2.4.x patch: trunk works, modulo CHANGES

     +1: rjung, covener, jim







PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -172,37 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     2.4.x patch: trunk works

     +1: jailletc36

     

  *) core: Save memory when calling 'ap_parse_htaccess'

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

     2.4.x patch: trunk works

     +1: jailletc36, covener, jim



  *) Use 'apr_pstrmemdup' instead of 'apr_pstrndup' when applicable in order

     to save a few cycles.

     Fix some style issues.

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

                  http://svn.apache.org/r1719189

                  http://svn.apache.org/r1719190

     2.4.x patch: trunk works

     +1: jailletc36, covener, jim



  *) mod_negotiation: Use 'ap_array_str_contains' to simplify code.

     core: likewise

     http: likewise

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

                  http://svn.apache.org/r1719254

                  http://svn.apache.org/r1719255

                  http://svn.apache.org/r1720996 (change in ap_method_in_list not

                                                  tested, it is not actually used)

     2.4.x patch: trunk works

     +1: jailletc36, covener, jim



  *) mod_mod_authn_socache: Do not use the magic string "directory". Use the

     corresponding global variable as in all other places of the module.

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

     2.4.x patch: trunk works

     +1: jailletc36, covener, jim



  *) mod_ssl: Save some TLS record (application data) fragmentations by

     including the last and subsequent suitable buckets when coalescing.

     trunk patch: http://svn.apache.org/r1723122
@@ -213,14 +221,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
                  http://people.apache.org/~ylavic/httpd-2.4.x-ssl_io_filter_coalesce.patch

     +1: ylavic



  *) mime.types: Add common extension "m4a" for MPEG 4 Audio.

     As a reference see Wikipedia:

     https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A

     PR: 57895

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

     2.4.x patch: trunk works, modulo CHANGES

     +1: rjung, covener, jim



  *) mod_rewrite: Avoid looping on relative substitutions that

     result in the same filename we started with. 

     PR 58854.