]> granicus.if.org Git - apache/commitdiff
copypasta error on r1796522, still needs a vote
authorEric Covener <covener@apache.org>
Sun, 28 May 2017 19:38:48 +0000 (19:38 +0000)
committerEric Covener <covener@apache.org>
Sun, 28 May 2017 19:38:48 +0000 (19:38 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1796524 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 92d6658a9ac61b9949ed2add1981aea9344ee390..30684228be78a14e8913ab6f31126f201019c72e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]