You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/12/13 14:44:25 UTC

svn commit: r1421292 - /httpd/httpd/branches/2.4.x/STATUS

Author: jim
Date: Thu Dec 13 13:44:24 2012
New Revision: 1421292

URL: http://svn.apache.org/viewvc?rev=1421292&view=rev
Log:
inherit inherit

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1421292&r1=1421291&r2=1421292&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Dec 13 13:44:24 2012
@@ -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