From da75eb0322e26e9cc30bb16f78c1e2c4023dfb50 Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Tue, 3 Oct 2006 12:58:24 +0000 Subject: [PATCH] * Sync with 2.2.x CHANGES file git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@452473 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 45cdaab7b0..8e7797f74f 100644 --- a/CHANGES +++ b/CHANGES @@ -8,12 +8,6 @@ Changes with Apache 2.3.0 *) mod_headers: support regexp-based editing of HTTP headers [Nick Kew] - *) mod_echo: Fix precedence problem in if statement. PR 40658. - [Larry Cipriani ] - - *) mod_mime_magic: Fix precedence problem in if statement. PR 40656. - [Larry Cipriani ] - *) mod_cache: Eliminate a bogus error in the log when a filter returns AP_FILTER_ERROR. [Niklas Edmundsson ] @@ -246,6 +240,12 @@ Changes with Apache 2.3.0 Changes with Apache 2.2.4 + *) mod_echo: Fix precedence problem in if statement. PR 40658. + [Larry Cipriani ] + + *) mod_mime_magic: Fix precedence problem in if statement. PR 40656. + [Larry Cipriani ] + *) The full server version information is now included in the error log at startup as well as server status reports, irrespective of the setting of the ServerTokens directive. ap_get_server_version() is now -- 2.40.0