From dbe9820533fcdb230828c0b71157affd0970bd0e Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 3 Aug 2007 15:24:37 +0000 Subject: [PATCH] Sync with 2.2.5-dev git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@562502 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 9247fa8728..74d758afab 100644 --- a/CHANGES +++ b/CHANGES @@ -2,9 +2,6 @@ Changes with Apache 2.3.0 [Remove entries to the current 2.0 and 2.2 section below, when backported] - *) mime.types: add Registered Javascript/ECMAScript MIME types (RFC4329) - PR 40299 [Dave Hodder ] - *) mime.types: add registered Apple installer type PR 40379 [Peter Bierman ] @@ -19,12 +16,6 @@ Changes with Apache 2.3.0 where the user is not in group X, but is in a subgroup contained in X. PR 42891 [Paul J. Reder] - *) mod_filter: fix integer comparisons in dispatch rules - PR 41835 [Nick Kew] - - *) mod_filter: fix merging of ! and = in FilterChain - PR 42186 [Issac Goldstand ] - *) mod_deflate: don't try to process metadata buckets as data. what should have been a 413 error was logged as a 500 and a blank screen appeared at the browser. @@ -306,6 +297,15 @@ Changes with Apache 2.3.0 Changes with Apache 2.2.5 + *) mime.types: add Registered Javascript/ECMAScript MIME types (RFC4329) + PR 40299 [Dave Hodder ] + + *) mod_filter: fix integer comparisons in dispatch rules + PR 41835 [Nick Kew] + + *) mod_filter: fix merging of ! and = in FilterChain + PR 42186 [Issac Goldstand ] + *) mod_cache: Let Cache-Control max-age set the expiration of the cached representation if Expires is not set. [Justin Erenkrantz] -- 2.40.0