httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kbr...@apache.org
Subject svn commit: r1501710 - in /httpd/httpd/branches/2.2.x: CHANGES modules/ssl/ssl_engine_io.c
Date Wed, 10 Jul 2013 10:31:24 GMT
Author: kbrand
Date: Wed Jul 10 10:31:24 2013
New Revision: 1501710

URL: http://svn.apache.org/r1501710
Log:
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.

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1501710&r1=1501709&r2=1501710&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Jul 10 10:31:24 2013
@@ -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
 

Modified: httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c?rev=1501710&r1=1501709&r2=1501710&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/branches/2.2.x/modules/ssl/ssl_engine_io.c Wed Jul 10 10:31:24 2013
@@ -1079,9 +1079,7 @@ static int ssl_io_filter_connect(ssl_fil
          * 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) {



Mime
View raw message