From 5323a97e5c2600506560af76de19f7182707c254 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 8 Aug 2018 11:46:52 +0000 Subject: [PATCH] promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1837644 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index 61ab9709ae..2852c3c732 100644 --- a/STATUS +++ b/STATUS @@ -131,6 +131,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: +1: jailletc36, ylavic (by inspection), covener jailletc36: untested, but looks straight forward enough to vote + *) Build tweaks: fix make -j install, Fedora config.layout. + trunk: http://svn.apache.org/r1836469 + http://svn.apache.org/r1836154 + 2.4.x patch: svn merge -c 1836469,1836154 ^/httpd/httpd/trunk . + +1: jorton, covener, jim PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -177,12 +182,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1801144,1801148,1801456 ^/httpd/httpd/trunk . +1: jailletc36, jim (via inspection) - *) Build tweaks: fix make -j install, Fedora config.layout. - trunk: http://svn.apache.org/r1836469 - http://svn.apache.org/r1836154 - 2.4.x patch: svn merge -c 1836469,1836154 ^/httpd/httpd/trunk . - +1: jorton, covener, jim - *) Support IPv6-sized client strings in mod_status and mod_echo trunk: http://svn.apache.org/r1837225 http://svn.apache.org/r1837366 -- 2.50.1