Synch with 2.0 branch.

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

diff --git a/CHANGES b/CHANGES
index daaa009764d47d142f2d82f4725ab8d82edb2a4c..b27bdf0bf7bffddcbb637d01b6ed0c938187808f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -50,9 +50,6 @@ Changes with Apache 2.1.0-dev
      Don't place script socket inside default server root instead of
      actual server root.  PR 27886.  [Jeff Trawick]
 
-  *) mod_ssl: Disable the extra session caching in OpenSSL to prevent memory
-     leak. PR 26562. [Madhusudan Mathihalli] 
-
   *) work around MSIE Digest auth bug - if AuthDigestEnableQueryStringHack
      is set in r->subprocess_env allow mismatched query strings to pass.
      PR 27758.  [Paul Querna <chip force-elite.com>, Geoffrey Young]
@@ -330,6 +327,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) mod_ssl: Fix memory leak in session cache handling.  PR 26562
+     [Madhusudan Mathihalli]
+
+  *) mod_ssl: Fix potential segfaults when performing SSL shutdown from
+     a pool cleanup.  PR 27945.  [Joe Orton]
+
   *) Add forensic logging module (mod_log_forensic).
      [Ben Laurie]
 
@@ -392,7 +395,7 @@ Changes with Apache 2.0.49
      [Paul J. Reder]
 
   *) mod_ssl: Send the Close Alert message to the peer before closing
-     the SSL session. [Madhusudan Mathihalli, Joe Orton]
+     the SSL session.  PR 27428.  [Madhusudan Mathihalli, Joe Orton]
 
   *) SECURITY: CAN-2004-0113 (cve.mitre.org)
      mod_ssl: Fix a memory leak in plain-HTTP-on-SSL-port handling.