From: Stefan Fritsch <sf@apache.org>
Date: Mon, 25 Jan 2010 22:12:19 +0000 (+0000)
Subject: Update backport proposal to current trunk version
X-Git-Tag: 2.2.15~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3594a5a4f87c198453c50995265f957e12892dd1;p=thirdparty%2Fapache%2Fhttpd.git

Update backport proposal to current trunk version


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

diff --git a/STATUS b/STATUS
index e1218a2c0b6..819024225c3 100644
--- a/STATUS
+++ b/STATUS
@@ -143,7 +143,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                  http://svn.apache.org/viewvc?rev=825177&view=rev
                  http://svn.apache.org/viewvc?rev=834499&view=rev
                  http://svn.apache.org/viewvc?rev=885121&view=rev
-    2.2.x Patch: http://people.apache.org/~sf/mod_reqtimeout.2.2.patch
+                 http://svn.apache.org/viewvc?rev=900018&view=rev
+                 http://svn.apache.org/viewvc?rev=902434&view=rev
+                 http://svn.apache.org/viewvc?rev=902593&view=rev
+    2.2.x Patch: http://people.apache.org/~sf/mod_reqtimeout.2.2-v2.patch
     +1: sf
 
   * http_request: We don't need to create new->allowed_methods both