From a4d8749eea3dc7c7797b6d89b7489c34f623db08 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 28 Dec 2017 11:49:50 +0000 Subject: [PATCH] And promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1819420 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index 2621b1951a..21f9c75bb8 100644 --- a/STATUS +++ b/STATUS @@ -126,6 +126,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [niq: I was about to backport along with the mod_proxy_html accepted patch, but I see this is on hold pending mod_md.h] + *) mod_proxy_html: Save a few bytes in the conf pool when handling + 'ProxyHTMLDoctype' directive with a user defined FPI + trunk patch: http://svn.apache.org/r1813991 + 2.4.x patch: svn merge -c r1813991 ^/httpd/httpd/trunk . + +1: jailletc36, niq, jim + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -240,12 +246,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c r1599012,r1601559,r1818624 ^/httpd/httpd/trunk . +1: niq, jim - *) mod_proxy_html: Save a few bytes in the conf pool when handling - 'ProxyHTMLDoctype' directive with a user defined FPI - trunk patch: http://svn.apache.org/r1813991 - 2.4.x patch: svn merge -c r1813991 ^/httpd/httpd/trunk . - +1: jailletc36, niq, jim - *) mpm_event: close connections not reported as handled by any module to avoid losing track of them and leaking scoreboard entries. PR 61551. trunk patch: http://svn.apache.org/r1818804 -- 2.40.0