Sync with httpd-trunk descript

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@534072 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0321a6b8223f2fa83096c45112760c0ff2beb5bb..ccd78ec07bdc5f2caedeeae1fa07a67a2c5dd326 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,10 +8,9 @@ Changes with Apache 2.2.5
   *) htdbm: Enable crypt support on platforms with crypt() but not
      <crypt.h>, such as z/OS. [David Jones <oscaremma gmail.com>]
 
-  *) mod_ssl: Move thread locking upcall initialization before
-     hardware library initialization, so hardware library can use
-     these upcalls when run in a threaded MPM. PR 20951.
-     [Sander Temme]
+  *) mod_ssl: initialize thread locks before initializing the hardware
+     acceleration library, so the latter can make use of the former. 
+     PR 20951. [adunn at ncipher.com]
 
   *) ab.c: Correct behavior of HTTP request headers sent by ab
      in presence of -H command-line overrides. PR 31268, 26554.