From 3c520bcf02b2840d60da746f17a795a70eec2ea9 Mon Sep 17 00:00:00 2001 From: Kaspar Brand Date: Wed, 10 Jul 2013 10:31:24 +0000 Subject: [PATCH] Revert r1500108 (as discussed on dev@, to be updated with the next commit): mod_ssl: Fix "SNI for backend" when compiled against OpenSSL without support for SSLv2. PR 55194. Followup to r1497466. Does not apply to trunk or 2.4.x. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1501710 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 +--- modules/ssl/ssl_engine_io.c | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index cf958010b9c..d39d14a29f9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,7 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.26 - *) mod_ssl: Fix compilation error when OpenSSL does not contain - support for SSLv2. Problem was introduced in 2.2.25. PR 55194. - [Rainer Jung] + Changes with Apache 2.2.25 diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 58bd6bc5a0b..13131900fb6 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -1079,9 +1079,7 @@ static int ssl_io_filter_connect(ssl_filter_ctx_t *filter_ctx) * IPv4 and IPv6 addresses are not permitted".) */ if (hostname_note && -#ifndef OPENSSL_NO_SSL2 sc->proxy->protocol != SSL_PROTOCOL_SSLV2 && -#endif sc->proxy->protocol != SSL_PROTOCOL_SSLV3 && apr_ipsubnet_create(&ip, hostname_note, NULL, c->pool) != APR_SUCCESS) { -- 2.47.2