From b7f2e31916c4be7f905dd86d672ef01555a8e49c Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Sun, 28 May 2017 19:38:48 +0000 Subject: [PATCH] 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 --- STATUS | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index 92d6658a9a..30684228be 100644 --- 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 ] -- 2.40.0