Commit 965bcaa3 authored by Rainer Jung's avatar Rainer Jung
Browse files

Support for OpenSSL 1.1.0: 

  - Followup to r1735875:
    ssl_util_thread_setup() is gone.

Backport of r1735925 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat@1755852 13f79535-47bb-0310-9956-ffa450edef68
parent b5a869bf

modules/ssl/ssl_engine_init.c

+2 −0
Original line number Diff line number Diff line
@@ -228,9 +228,11 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, 
#endif

    }



#if OPENSSL_VERSION_NUMBER < 0x10100000L

#if APR_HAS_THREADS

    ssl_util_thread_setup(p);

#endif

#endif /* #if OPENSSL_VERSION_NUMBER < 0x10100000L */



    /*

     * SSL external crypto device ("engine") support

modules/ssl/ssl_private.h

+2 −0
Original line number Diff line number Diff line
@@ -892,7 +892,9 @@ void ssl_util_ppclose(server_rec *, apr_pool_t *, apr_file_t *); 
char        *ssl_util_readfilter(server_rec *, apr_pool_t *, const char *,

                                 const char * const *);

BOOL         ssl_util_path_check(ssl_pathcheck_t, const char *, apr_pool_t *);

#if OPENSSL_VERSION_NUMBER < 0x10100000L

void         ssl_util_thread_setup(apr_pool_t *);

#endif

int          ssl_init_ssl_connection(conn_rec *c, request_rec *r);



BOOL         ssl_util_vhost_matches(const char *servername, server_rec *s);