httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kbr...@apache.org
Subject svn commit: r1222931 - /httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c
Date Sat, 24 Dec 2011 07:34:07 GMT
Author: kbrand
Date: Sat Dec 24 07:34:07 2011
New Revision: 1222931

URL: http://svn.apache.org/viewvc?rev=1222931&view=rev
Log:
merge r1222930 from trunk:

add missing #ifdef in ssl_cmd_protocol_parse (should have been in r1222921)

Modified:
    httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c

Modified: httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c?rev=1222931&r1=1222930&r2=1222931&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/branches/2.4.x/modules/ssl/ssl_engine_config.c Sat Dec 24 07:34:07 2011
@@ -1283,12 +1283,14 @@ static const char *ssl_cmd_protocol_pars
         else if (strcEQ(w, "TLSv1")) {
             thisopt = SSL_PROTOCOL_TLSV1;
         }
+#ifdef HAVE_TLSV1_X
         else if (strcEQ(w, "TLSv1.1")) {
             thisopt = SSL_PROTOCOL_TLSV1_1;
         }
         else if (strcEQ(w, "TLSv1.2")) {
             thisopt = SSL_PROTOCOL_TLSV1_2;
         }
+#endif
         else if (strcEQ(w, "all")) {
             thisopt = SSL_PROTOCOL_ALL;
         }



Mime
View raw message