You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2020/03/12 02:04:38 UTC
svn commit: r1875113 - in /httpd/httpd/branches/2.4.x: ./
modules/ssl/mod_ssl.c modules/ssl/ssl_private.h
Author: covener
Date: Thu Mar 12 02:04:38 2020
New Revision: 1875113
URL: http://svn.apache.org/viewvc?rev=1875113&view=rev
Log:
Merge r1874323 from trunk:
mod_ssl: follow up to r1861950: allow for OPENSSL_init_ssl() without autoconf.
For systems with no autoconf (eg. Windows), still check for and use
OPENSSL_init_ssl() based on OpenSSL version >= 1.1.0.
Usual LibreSSL gotcha, exclude LIBRESSL_VERSION_NUMBER from this new heuristic
since autoconf is likely available in this case.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c
httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1874323
Modified: httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c?rev=1875113&r1=1875112&r2=1875113&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/mod_ssl.c Thu Mar 12 02:04:38 2020
@@ -24,7 +24,6 @@
* Apache API interface structures
*/
-#include "ap_config_auto.h"
#include "ssl_private.h"
#include "mod_ssl.h"
#include "mod_ssl_openssl.h"
@@ -329,9 +328,10 @@ static int modssl_is_prelinked(void)
static apr_status_t ssl_cleanup_pre_config(void *data)
{
-#if HAVE_OPENSSL_INIT_SSL
- /* Openssl v1.1+ handles all termination automatically. Do
- * nothing in this case.
+#if HAVE_OPENSSL_INIT_SSL || (OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+ !defined(LIBRESSL_VERSION_NUMBER))
+ /* Openssl v1.1+ handles all termination automatically from
+ * OPENSSL_init_ssl(). Do nothing in this case.
*/
#else
@@ -395,7 +395,8 @@ static int ssl_hook_pre_config(apr_pool_
{
modssl_running_statically = modssl_is_prelinked();
-#if HAVE_OPENSSL_INIT_SSL
+#if HAVE_OPENSSL_INIT_SSL || (OPENSSL_VERSION_NUMBER >= 0x10100000L && \
+ !defined(LIBRESSL_VERSION_NUMBER))
/* Openssl v1.1+ handles all initialisation automatically, apart
* from hints as to how we want to use the library.
*
Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h?rev=1875113&r1=1875112&r2=1875113&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_private.h Thu Mar 12 02:04:38 2020
@@ -27,6 +27,7 @@
*/
/** Apache headers */
+#include "ap_config.h"
#include "httpd.h"
#include "http_config.h"
#include "http_core.h"