summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2017-07-29 20:35:56 +0000
committerYann Ylavic <ylavic@apache.org>2017-07-29 20:35:56 +0000
commit36d01334ab8cb2127ff59ecac7cbfb17b3babf74 (patch)
treee050a550081aa89a961f8369aa4eedd83e8c5793
parentb1c493dd087ee7797e1b994b3a86afac011d1821 (diff)
downloadhttpd-36d01334ab8cb2127ff59ecac7cbfb17b3babf74.tar.gz
mod_ssl: we can't use SSL_COMP_free_compression_methods() if OPENSSL_NO_COMP
is defined. PR 61206. Submitted by: Michael Schlenker <msc contact.de> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1803392 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--modules/ssl/mod_ssl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 2e299e7b2f..dd34848c5f 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -348,8 +348,10 @@ static apr_status_t ssl_cleanup_pre_config(void *data)
ENGINE_cleanup();
#endif
#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
+#ifndef OPENSSL_NO_COMP
SSL_COMP_free_compression_methods();
#endif
+#endif
/* Usually needed per thread, but this parent process is single-threaded */
#if OPENSSL_VERSION_NUMBER < 0x10100000L