Commit a17238bd authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

mod_ssl: initialize thread locks before initializing the hardware 

acceleration library, so the latter can make use of the former.

PR: 20951
Patch: http://people.apache.org/~sctemme/2.0.x-ssl_engine_init.c.patch
Submitted by: <adunn ncipher.com>
Reviewed by: sctemme, rpluem, wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@536375 13f79535-47bb-0310-9956-ffa450edef68
parent 0a095c38

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.0.60













  *) mod_ssl: initialize thread locks before initializing the hardware













     acceleration library, so the latter can make use of the former. 













     PR 20951. [<adunn ncipher.com>]



























  *) mod_ssl: Support limited buffering of request bodies to allow 















     per-location renegotiation to proceed.  PR 12355.  [Joe Orton]















































STATUS



+0
−6






























Original line number
Diff line number
Diff line








@@ -114,12 +114,6 @@ RELEASE SHOWSTOPPERS:













PATCHES ACCEPTED TO BACKPORT FROM TRUNK:















  [ start all new proposals below, under PATCHES PROPOSED. ]





























    * 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. 













      [adunn at ncipher.com]













      http://people.apache.org/~sctemme/2.0.x-ssl_engine_init.c.patch













      +1: sctemme, rpluem, wrowe































PATCHES PROPOSED TO BACKPORT FROM TRUNK:















  [ please place SVN revisions from trunk here, so it is easy to

































modules/ssl/ssl_engine_init.c



+4
−4






























Original line number
Diff line number
Diff line








@@ -232,6 +232,10 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,





























    }





























#if APR_HAS_THREADS













    ssl_util_thread_setup(p);













#endif





























    /*















     * SSL external crypto device ("engine") support















     */









@@ -241,10 +245,6 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,





























    ssl_init_SSLLibrary(base_server);





























#if APR_HAS_THREADS













    ssl_util_thread_setup(p);













#endif





























    /*















     * Seed the Pseudo Random Number Generator (PRNG)















     * only need ptemp here; nothing inside allocated from the pool