www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Support for OpenSSL 1.1.0:

Browse Source 
- 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
This commit is contained in:
Rainer Jung
2016-03-21 08:47:15 +00:00
parent 985d9885d7
commit 8bcf9ed952
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ssl/ssl_engine_init.c
View File

@@ -231,9 +231,11 @@ apr_status_t ssl_init_Module(apr_pool_t *p, apr_pool_t *plog,
#endif #endif
} }
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#if APR_HAS_THREADS #if APR_HAS_THREADS
ssl_util_thread_setup(p); ssl_util_thread_setup(p);
#endif #endif
#endif /* #if OPENSSL_VERSION_NUMBER < 0x10100000L */
/* /*
* SSL external crypto device ("engine") support * SSL external crypto device ("engine") support

2
modules/ssl/ssl_private.h
View File

@@ -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 *, char *ssl_util_readfilter(server_rec *, apr_pool_t *, const char *,
const char * const *); const char * const *);
BOOL ssl_util_path_check(ssl_pathcheck_t, const char *, apr_pool_t *); 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 *); void ssl_util_thread_setup(apr_pool_t *);
#endif
int ssl_init_ssl_connection(conn_rec *c, request_rec *r); int ssl_init_ssl_connection(conn_rec *c, request_rec *r);
BOOL ssl_util_vhost_matches(const char *servername, server_rec *s); BOOL ssl_util_vhost_matches(const char *servername, server_rec *s);