From: Geoffrey Young <geoff@apache.org>
Date: Fri, 9 Apr 2004 01:00:53 +0000 (+0000)
Subject: propose backport
X-Git-Tag: 2.0.50~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7288433d7f0fcd1ef1882583e14ed824007b6f90;p=thirdparty%2Fapache%2Fhttpd.git

propose backport


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

diff --git a/STATUS b/STATUS
index 8f05a9ed3bf..433e88a2202 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/04/07 21:49:47 $]
+Last modified at [$Date: 2004/04/09 01:00:53 $]
 
 Release:
 
@@ -72,6 +72,11 @@ 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! ]
 
+    *) Enable special ErrorDocument value 'default' which restores the
+       canned server response for the scope of the directive
+         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.270&r2=1.271
+       +1: geoff
+
     *) Nested <IfDefine> blocks will cause ap_build_cont_config()
        to be called recursively. Allocate the temporary 8k 
        string buffer from the temp_pool rather than the stack to