Commit 91c37cb2 authored by Eric Covener's avatar Eric Covener
Browse files

copypasta error on r1796522, still needs a vote 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1796524 13f79535-47bb-0310-9956-ffa450edef68
parent d9c2834a

STATUS

+4 −6
Original line number Diff line number Diff line
@@ -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 ]