++merges

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

diff --git a/STATUS b/STATUS
index e3fff7bee56578db81476195e08835996e117e9a..f233cbd9ce334ad42dbdc334014255895b0b9a51 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/10 15:10:31 $]
+Last modified at [$Date: 2004/03/14 16:46:50 $]
 
 Release:
 
@@ -71,6 +71,12 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
+    *) Allow Satisfy directives to be influenced by <Limit>.
+       PR: 14726
+         include/http_core.h: r1.81
+         server/core.c: r1.266
+       +1: nd
+
     *) Win32: Tweak worker thread accounting routines to prevent
        server hang when number of Listen directives is >=
        ThreadsPerChild.