Commit f2daeed8 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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. 



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

CHANGES

+5 −0
Original line number Diff line number Diff line 
                                                        -*- 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>]

































modules/ssl/ssl_engine_init.c



+4
−4






























Original line number
Diff line number
Diff line








@@ -231,6 +231,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















     */









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













    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,















                 "Init: Initialized %s library", SSL_LIBRARY_NAME);