]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
The added path is canceled out by the next one,
authorRainer Jung <rjung@apache.org>
Sun, 25 Jul 2010 11:00:24 +0000 (11:00 +0000)
committerRainer Jung <rjung@apache.org>
Sun, 25 Jul 2010 11:00:24 +0000 (11:00 +0000)
but without it the sequence doesn't apply cleanly.

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

STATUS

diff --git a/STATUS b/STATUS
index 15c668a2bf138a3cbd144ef694e1fc20d41af707..cbd08eb4abf5c8cb39068e5ce56d6de30cc4b6e6 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -192,10 +192,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Trunk version of patch:
         http://svn.apache.org/viewcvs.cgi?rev=620133&view=rev
         http://svn.apache.org/viewcvs.cgi?rev=724515&view=rev
+        http://svn.apache.org/viewcvs.cgi?rev=724805&view=rev
         http://svn.apache.org/viewcvs.cgi?rev=725077&view=rev
         http://svn.apache.org/viewcvs.cgi?rev=952828&view=rev
      Backport version for 2.2.x of patch:
         Trunk version of patch works
+        For convenience (CHANGES might need some addition):
+        http://people.apache.org/~rjung/patches/pr17629-2_2_x.patch
      +1: rpluem, jim
 
    * Core: fix symlinks ownership tests