From 0fe9c3e6ad3825010435efdfd1bde777da5f0c5b Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 28 Dec 2017 11:49:24 +0000 Subject: [PATCH] backport votes git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1819419 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/STATUS b/STATUS index b009b9267b3..2621b1951a9 100644 --- a/STATUS +++ b/STATUS @@ -238,13 +238,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1601559 http://svn.apache.org/r1818624 (style only) 2.4.x patch: svn merge -c r1599012,r1601559,r1818624 ^/httpd/httpd/trunk . - +1: niq + +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 + +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. -- 2.47.3