From d03123dbca7298063c224156ed5f5af277c05fe0 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 13 Dec 2012 13:44:24 +0000 Subject: [PATCH] inherit inherit git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1421292 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/STATUS b/STATUS index d901704e84..417c5b2b06 100644 --- 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 -- 2.40.0