From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 5 Mar 2016 11:36:12 +0000 (+0000)
Subject: Proposals
X-Git-Tag: 2.4.19~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90d0eb515e1100fb2a3aadd43f9f7c6e933179e1;p=thirdparty%2Fapache%2Fhttpd.git

Proposals

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1733701 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 5f3cc0fd5c4..8fcb89a098a 100644
--- a/STATUS
+++ b/STATUS
@@ -153,6 +153,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-exit_with_error_on_mpm_failure.patch
      +1: ylavic, jim
 
+  *) Synch 2.4.x with trunk, Strip useless apr_brigade_cleanup() calls.
+     trunk patch: http://svn.apache.org/r1601624
+     2.4.x patch: trunk patch works
+     +1: jailletc36
+
+  *) Use ap_array_str_contains to simplify code
+     trunk patch: http://svn.apache.org/r1733523
+                  http://svn.apache.org/r1733691
+     2.4.x patch: trunk patch works
+     +1: jailletc36
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED