From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 2 Jun 2008 21:29:39 +0000 (+0000)
Subject: * These are now backported
X-Git-Tag: 2.3.0~554
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f8966d395c2fe452a2058110acfd4ef4c5b0acd;p=thirdparty%2Fapache%2Fhttpd.git

* These are now backported


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

diff --git a/CHANGES b/CHANGES
index 4c6e3e5bb57..003cb928972 100644
--- a/CHANGES
+++ b/CHANGES
@@ -168,9 +168,6 @@ Changes with Apache 2.3.0
   *) mod_ssl: Add support for OCSP validation of client certificates.
      PR 41123.  [Marc Stern <marc.stern approach.be>, Joe Orton]
 
-  *) mod_unique_id: Fix timestamp value in UNIQUE_ID.
-     PR 37064 [Kobayashi <kobayashi firstserver.co.jp>]
-
   *) mod_serf: New module for Reverse Proxying. [Paul Querna]
 
   *) core: Add the option to keep aside a request body up to a certain
@@ -278,10 +275,6 @@ Changes with Apache 2.3.0
   *) mod_proxy: Support environment variable interpolation in reverse
      proxying directives. [Nick Kew]
 
-  *) core: Add the filename of the configuration file to the warning message
-     about the useless use of AllowOverride. PR 39992.
-     [Darryl Miles <darryl darrylmiles.org>]
-
   *) New SSLLogLevelDebugDump [ None (default) | IO (not bytes) | Bytes ]
      configures the I/O Dump of SSL traffic, when LogLevel is set to Debug.
      The default is none as this is far greater debugging resolution than