summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2017-12-28 11:49:24 +0000
committerJim Jagielski <jim@apache.org>2017-12-28 11:49:24 +0000
commit0fe9c3e6ad3825010435efdfd1bde777da5f0c5b (patch)
tree77712e5ce6af107c883858f5ced047b332d725f9
parent4dc5c33b84984a1490e4eac8911cad4a24af2ba3 (diff)
downloadhttpd-0fe9c3e6ad3825010435efdfd1bde777da5f0c5b.tar.gz
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1819419 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--STATUS4
1 files changed, 2 insertions, 2 deletions
diff --git a/STATUS b/STATUS
index b009b9267b..2621b1951a 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.