]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Merge r1875544 from trunk:
authorYann Ylavic <ylavic@apache.org>
Mon, 23 Mar 2020 17:56:10 +0000 (17:56 +0000)
committerYann Ylavic <ylavic@apache.org>
Mon, 23 Mar 2020 17:56:10 +0000 (17:56 +0000)
Fix compilation breakage with OpenSSL 1.1.0 up to 1.1.0f.
SSL_CTX_get_min_proto_version() and
SSL_CTX_get_max_proto_version() were only introduced in
1.1.0g.

Submitted by: rjung
Reviewedby: rjung, rpluem, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1875553 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_engine_kernel.c

index 6580385e1a18d3150c3d9b7884159536c05560e3..cbab6a3d4c70635ddce66b5ecdd3bb580c4bde41 100644 (file)
@@ -2494,7 +2494,7 @@ static int ssl_find_vhost(void *servername, conn_rec *c, server_rec *s)
          * from the ctx by hand
          */
         SSL_set_options(ssl, SSL_CTX_get_options(ctx));
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L \
+#if OPENSSL_VERSION_NUMBER >= 0x1010007fL \
         && (!defined(LIBRESSL_VERSION_NUMBER) \
             || LIBRESSL_VERSION_NUMBER >= 0x20800000L)
         /*