From 65ec190a94625ca44bd2a98d091aa28e4349cbb9 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Thu, 15 Mar 2018 20:09:39 +0000 Subject: [PATCH] Easy vote + promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826859 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/STATUS b/STATUS index e8d0c77ddf..8ab61d814c 100644 --- a/STATUS +++ b/STATUS @@ -146,6 +146,13 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1812756 ^/httpd/httpd/trunk . +1: rjung, ylavic, covener + *) htpasswd/htdbm: report the right limit when get_password() overflows. + This brings 2.4.x passwd_common.c in sync with trunk. + trunk patch: http://svn.apache.org/r1781516 + 2.4.x patch: svn merge -c 1781516 ^/httpd/httpd/trunk . + plus CHANGES + +1: rjung, covener, jailletc36 + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -194,13 +201,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: minus second unrelated CHANGES entry +1: rjung, covener - *) htpasswd/htdbm: report the right limit when get_password() overflows. - This brings 2.4.x passwd_common.c in sync with trunk. - trunk patch: http://svn.apache.org/r1781516 - 2.4.x patch: svn merge -c 1781516 ^/httpd/httpd/trunk . - plus CHANGES - +1: rjung, covener - *) rotatelogs: Add an option to autocreate directories to rotatelogs. PR: 46669 trunk patch: http://svn.apache.org/r1533810 -- 2.40.0