Commit 268490f7 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@1796848 13f79535-47bb-0310-9956-ffa450edef68
parent c20d3d2d

STATUS

+18 −17
Original line number Diff line number Diff line
@@ -152,6 +152,24 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch:  svn merge -c 1795635 ^/httpd/httpd/trunk . (modulo CHANGES)

     +1: jailletc36, covener, ylavic



  *) mod_ssl: Consistently pass the expected bio_filter_in_ctx_t

     to ssl_io_filter_error(). [Yann Ylavic]

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

     2.4.x patch: svn merge -c 1796343 ^/httpd/httpd/trunk . (modulo CHANGES)

     +1: covener, ylavic, jim



  *) core: Deprecate ap_get_basic_auth_pw() and add 

     ap_get_basic_auth_components(). 

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

     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-ap_get_basic_auth_pw.diff + CHANGES

     +1: covener, ylavic, jim



  *) core: Terminate token processing on NULL.

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

     2.4.x patch: svn merge -c 1796350 ^/httpd/httpd/trunk .

     +1: covener, ylavic, jim





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]
@@ -205,23 +223,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     2.4.x patch: trunk works (modulo CHANGES)

     +1: ylavic, jim



  *) mod_ssl: Consistently pass the expected bio_filter_in_ctx_t

     to ssl_io_filter_error(). [Yann Ylavic]

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

     2.4.x patch: svn merge -c 1796343 ^/httpd/httpd/trunk . (modulo CHANGES)

     +1: covener, ylavic, jim



  *) core: Deprecate ap_get_basic_auth_pw() and add 

     ap_get_basic_auth_components(). 

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

     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-ap_get_basic_auth_pw.diff + CHANGES

     +1: covener, ylavic, jim



  *) core: Terminate token processing on NULL.

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

     2.4.x patch: svn merge -c 1796350 ^/httpd/httpd/trunk .

     +1: covener, ylavic, jim



  *) event: Avoid listener periodic wake ups by using the pollset wake-ability

     when available.  PR 57399.

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