]> granicus.if.org Git - apache/commitdiff
Support for OpenSSL 1.1.0:
authorRainer Jung <rjung@apache.org>
Mon, 21 Mar 2016 08:47:15 +0000 (08:47 +0000)
committerRainer Jung <rjung@apache.org>
Mon, 21 Mar 2016 08:47:15 +0000 (08:47 +0000)
  - 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
modules/ssl/ssl_private.h

index 1b9cee4004ba254a64d7e8985094f932fb0a0b31..7423b06cfe55a0e0717b33f270ef28098a6c0085 100644 (file)
@@ -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
index 7b4c117c1fe649fd6965c041145978ea77a4f777..958a713948082178a23f4e34cb16686b710cdf6f 100644 (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 *,
                                  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);