From: André Malo <nd@apache.org>
Date: Sun, 2 Nov 2003 22:12:27 +0000 (+0000)
Subject: ++merges.
X-Git-Tag: 2.0.49~398
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2397da438875af056a05fd78855c98382a75762e;p=thirdparty%2Fapache%2Fhttpd.git

++merges.


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

diff --git a/STATUS b/STATUS
index 0e96c66c4e5..1cfe2293f1a 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/11/02 20:39:16 $]
+Last modified at [$Date: 2003/11/02 22:12:27 $]
 
 Release:
 
@@ -305,6 +305,10 @@ PATCHES TO BACKPORT FROM 2.1
         include/ap_mmn.h: r1.60
       +1: nd
 
+    * mod_include: Don't allow ETag to be sent in 304. PR 19355.
+        modules/filters/mod_include.c: r1.290
+      +1: nd
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,