From: Stefan Fritsch <sf@apache.org>
Date: Tue, 24 Aug 2010 17:39:33 +0000 (+0000)
Subject: Update proposed patch
X-Git-Tag: 2.2.17~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=771382c4880a18742c881e7cf2ea985b04ffa93f;p=thirdparty%2Fapache%2Fhttpd.git

Update proposed patch


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

diff --git a/STATUS b/STATUS
index 061ddf3e64d..03834e29bf7 100644
--- a/STATUS
+++ b/STATUS
@@ -117,12 +117,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                  http://svn.apache.org/viewvc?rev=933341&view=rev
                  http://svn.apache.org/viewvc?rev=933547&view=rev
                  http://svn.apache.org/viewvc?rev=935339&view=rev
-    2.2.x patch: http://people.apache.org/~sf/mod_reqtimeout_up_to_r935339-v2.diff
+                 http://svn.apache.org/viewvc?rev=983116&view=rev
+                 http://svn.apache.org/viewvc?rev=984985&view=rev
+    2.2.x patch: http://people.apache.org/~sf/mod_reqtimeout_up_to_r983116.diff
     sf: It would be nice if someone could review this specifically WRT Windows
         compatibility.
     +1: sf
-    rpluem says: The proposed patch fails with conflicts in 2.2.x. Please
-                 update the patch.
 
   * prefork MPM: Run cleanups for final request when process exits gracefully.
     PR: 43857