From: Jim Jagielski <jim@apache.org>
Date: Mon, 28 Jan 2013 14:31:32 +0000 (+0000)
Subject: PPI patch from dev@ discussion
X-Git-Tag: 2.4.4~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f1f4035d296aa7cb00232cd7be18d0db7dbb162;p=apache

PPI patch from dev@ discussion


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

diff --git a/STATUS b/STATUS
index d51ccce42d..abc81c8e3a 100644
--- a/STATUS
+++ b/STATUS
@@ -95,6 +95,7 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      trunk patch: https://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?r1=1396440&r2=1429228
      2.4.x patch: trunk patch works
      +1: kbrand, jorton, jerenkrantz
+     -1: jim: patch doesn't apply (2 out of 2 hunks FAILED -- saving rejects to file acinclude.m4.rej)
     
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -149,6 +150,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                  jim: are we OK with changing the 2.4.x docs async?
                  druggeri: sure - just noting that as-applied it would be incorrect
 
+  * mod_proxy: Allow ProxyPass to also be server-specific.
+    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1439404
+    2.4.x patch: trunk patch works modulo ap_mmn and docs ("2.5.0")
+                 Assumes BalancerInherit patch above.
+    +1: 
+
   * mod_ssl: Allow the SSLUserName to be used to control the
     username passed by the FakeBasicAuth option. PR52616.
     trunk patch: http://svn.apache.org/viewvc?rev=1432322&view=rev