From 8bcf9ed9528b2a8af3b8ccaf8ab601cb396ac149 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Mon, 21 Mar 2016 08:47:15 +0000 Subject: [PATCH] Support for OpenSSL 1.1.0: - Followup to r1735875: ssl_util_thread_setup() is gone. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735925 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_init.c | 2 ++ modules/ssl/ssl_private.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index 1b9cee4004..7423b06cfe 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -231,9 +231,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 diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index 7b4c117c1f..958a713948 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -878,7 +878,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); -- 2.40.0