From: André Malo <nd@apache.org>
Date: Sun, 14 Mar 2004 16:46:50 +0000 (+0000)
Subject: ++merges
X-Git-Tag: 2.0.49~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f0814013bbb6419065f4c7a0e732c805569aefd;p=thirdparty%2Fapache%2Fhttpd.git

++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 e3fff7bee56..f233cbd9ce3 100644
--- 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.