* These are now backported.

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

diff --git a/CHANGES b/CHANGES
index d677d6918686b3bb21488715aa3cb7542d3ad938..c13c394bfa09f8b6deff0d23a22d1e0600c5751f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -19,9 +19,6 @@ Changes with Apache 2.3.0
      and to enable different virtualhosts to run with different
      privileges and Unix user/group IDs [Nick Kew]
 
-  *) Build: Correctly set SSL_LIBS during openssl detection if pkgconfig is
-     not available. PR 46018 [Ruediger Pluem]
-
   *) authn/z: Remove mod_authn_default and mod_authz_default.
      [Chris Darroch]
 
@@ -369,10 +366,6 @@ Changes with Apache 2.3.0
      within the configured boundaries before actually saving data.
      [Niklas Edmundsson <nikke acc.umu.se>]
 
-  *) mod_cache: Convert all values to seconds before comparing them when
-     checking whether to send a Warning header for a stale response.
-     PR 39713. [Owen Taylor <otaylor redhat.com>]
-
   *) mod_disk_cache: Delete temporary files if they cannot be renamed to their
      final name. [Davi Arnaut <davi haxent.com.br>]