From: Jim Jagielski <jim@apache.org>
Date: Thu, 13 Jun 2013 15:19:31 +0000 (+0000)
Subject: Bring proxy and core up to sync
X-Git-Tag: 2.4.5~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21a4f7f02469bfb3e8108d01a22657faa05f737a;p=apache

Bring proxy and core up to sync


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

diff --git a/STATUS b/STATUS
index a0ab82736f..90fa53110f 100644
--- a/STATUS
+++ b/STATUS
@@ -192,7 +192,26 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works modulo CHANGES
       +1: minfrin
 
+    * mod_proxy: protect pool usage w/ mutex.
+      trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1480627
+                   https://svn.apache.org/viewvc?view=revision&revision=1482859
+      2.4.x patch: trunk patch works modulo CHANGES
+      +1: jim
 
+    * mod_proxy: header clearing issues
+      trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1481891
+                   https://svn.apache.org/viewvc?view=revision&revision=1482075
+                   https://svn.apache.org/viewvc?view=revision&revision=1482170
+                   https://svn.apache.org/viewvc?view=revision&revision=1482555
+      2.4.x patch: trunk patch works modulo CHANGES and ap_mmn
+      +1: jim
+
+    * core: Stop the HTTP_IN filter from attempting to write error buckets
+      to the output filters
+      trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1482522
+      2.4.x patch: trunk patch works modulo CHANGES and ap_mmn
+      +1: 
+      
 A list of further possible backports can be found at:                                                                                                                                   
     http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt
 If you want to propose one of those, please still add them here.