You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2016/02/14 17:36:04 UTC
svn commit: r1730351 - /httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
Author: rjung
Date: Sun Feb 14 16:36:04 2016
New Revision: 1730351
URL: http://svn.apache.org/viewvc?rev=1730351&view=rev
Log:
Add remark about backport obstacle.
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_init.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_init.c?rev=1730351&r1=1730350&r2=1730351&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_init.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_init.c Sun Feb 14 16:36:04 2016
@@ -489,6 +489,10 @@ static void ssl_set_ctx_protocol_option(
SSL_CTX_set_options(ctx, option);
}
else if (SSL_CTX_get_options(ctx) & option) {
+ /*
+ * Do not backport to 2.4: SSL_CTX_clear_options()
+ * was only introduced in OpenSSL 0.9.8m.
+ */
SSL_CTX_clear_options(ctx, option);
ap_log_error(APLOG_MARK, APLOG_WARNING, 0, s, APLOGNO(02904)
"Allowing SSLProtocol %s even though it is disabled "