You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by co...@apache.org on 2017/05/28 19:38:49 UTC

svn commit: r1796524 - /httpd/httpd/branches/2.4.x/STATUS

Author: covener
Date: Sun May 28 19:38:48 2017
New Revision: 1796524

URL: http://svn.apache.org/viewvc?rev=1796524&view=rev
Log:
copypasta error on r1796522, still needs a vote


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=1796524&r1=1796523&r2=1796524&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun May 28 19:38:48 2017
@@ -158,12 +158,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch:  svn merge -c 1795635 ^/httpd/httpd/trunk . (modulo CHANGES)
      +1: jailletc36, covener, ylavic
 
-  *) 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
-
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -229,6 +223,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-ap_get_basic_auth_pw.diff + CHANGES
      +1: covener, ylavic
 
+  *) 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
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entried should be added at the START of the list ]