You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2017/05/30 12:16:56 UTC
svn commit: r1796848 - /httpd/httpd/branches/2.4.x/STATUS

Author: jim
Date: Tue May 30 12:16:56 2017
New Revision: 1796848

URL: http://svn.apache.org/viewvc?rev=1796848&view=rev
Log:
promote


Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1796848&r1=1796847&r2=1796848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue May 30 12:16:56 2017
@@ -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