inherit inherit

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

diff --git a/STATUS b/STATUS
index d901704e844d3949871a2bf5c89065140538636a..417c5b2b060bb47d599c7246a532e0fb866c7802 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -128,7 +128,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1387603
                   http://svn.apache.org/viewvc?view=revision&revision=1388029
                   http://svn.apache.org/viewvc?view=revision&revision=1420124
-     2.4.x patch: http://people.apache.org/~jim/patches/proxypassinherit.patch
+                  http://svn.apache.org/viewvc?view=revision&revision=1421288
+     2.4.x patch: http://people.apache.org/~jim/patches/proxypassinherit2.patch
      +1: jim, druggeri
      rjung: - IMHO "inherit" also needs to be set in overrides while merging.
             - I would also simplify the inheritance check during merge to