Synch with 2.0 branch.

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

diff --git a/CHANGES b/CHANGES
index 368597b7cea8aba557bcae95b3ebb4a568610902..50e2c50359b8a6b14cce72927d4ee23acedd091d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -258,6 +258,18 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_log_config: Log the minutes component of the timezone correctly.
+     PR 23642.  [Hong-Gunn Chew <hgbug gunnet.org>]
+
+  *) mod_proxy: Fix cases where an invalid status-line could be sent 
+     to the client.  PR 23998.  [Joe Orton]
+
+  *) mod_ssl: Fix segfaults at startup if other modules which use OpenSSL
+     are also loaded.  [Joe Orton]
+
+  *) mod_ssl: Use human-readable OpenSSL error strings in logs; use
+     thread-safe interface for retrieving error strings.  [Joe Orton]
+
   *) mod_expires: Initialize ExpiresDefault to NULL instead of "" to
      avoid reporting an Internal Server error if it is used without
      having been set in the httpd.conf file. PR: 23748, 24459