From: Jim Jagielski <jim@apache.org>
Date: Tue, 29 Aug 2006 01:35:58 +0000 (+0000)
Subject: Working on combined patch... just need to find out how to get 'svn diff'
X-Git-Tag: 2.2.4~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb1e7c43c7a209e234b1d09f87c3614471af84c1;p=thirdparty%2Fapache%2Fhttpd.git

Working on combined patch... just need to find out how to get 'svn diff'
to "create" a new file...


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

diff --git a/STATUS b/STATUS
index 86250e3869d..a4ec003ad21 100644
--- a/STATUS
+++ b/STATUS
@@ -185,14 +185,5 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       Trunk version of patch:
         http://svn.apache.org/viewvc?view=rev&revision=425454
       2.2.x version of patch:
-        Trunk version works
-      +1: mturk, jim
-      -1: rpluem: The patch does not apply cleanly to 2.2.x. The second part of
-                  the mod_proxy.c patch fails (which seems to be tabs vs. spaces).
-                  Furthermore the patch
-
-                    http://svn.apache.org/viewvc?view=rev&revision=425523
-
-                  misses so mod_proxy_ajp does not load any longer.
-                  Once these things are fixed I am +1.
-
+        < in process >
+      +1: mturk