You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2007/05/01 15:16:58 UTC
svn commit: r534062 - in /httpd/httpd/branches/2.2.x: CHANGES
modules/ssl/ssl_engine_init.c
Author: jim
Date: Tue May 1 06:16:58 2007
New Revision: 534062
URL: http://svn.apache.org/viewvc?view=rev&rev=534062
Log:
Approved backport:
* mod_ssl: Move thread locking upcall initialization before
hardware library initialization, so hardware library can use
these upcalls when run in a threaded MPM. Fixes PR 20951.
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=534062&r1=534061&r2=534062
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue May 1 06:16:58 2007
@@ -1,6 +1,11 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.5
+ *) 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]
+
*) ab.c: Correct behavior of HTTP request headers sent by ab
in presence of -H command-line overrides. PR 31268, 26554.
[Arvind Srinivasan <arvind.srinivasan sun.com>]
Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c?view=diff&rev=534062&r1=534061&r2=534062
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_init.c Tue May 1 06:16:58 2007
@@ -231,15 +231,15 @@
}
+#if APR_HAS_THREADS
+ ssl_util_thread_setup(p);
+#endif
+
/*
* SSL external crypto device ("engine") support
*/
#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_ENGINE_INIT)
ssl_init_Engine(base_server, p);
-#endif
-
-#if APR_HAS_THREADS
- ssl_util_thread_setup(p);
#endif
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,