]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
++merges.
authorAndré Malo <nd@apache.org>
Sun, 2 Nov 2003 22:12:27 +0000 (22:12 +0000)
committerAndré Malo <nd@apache.org>
Sun, 2 Nov 2003 22:12:27 +0000 (22:12 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@101688 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 0e96c66c4e5ca4047d1f8035213c332393ff9104..1cfe2293f1a2c69bb47fa84bd59c570aaf171fb8 100644 (file)
--- 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,