From: Rainer Jung <rjung@apache.org>
Date: Sun, 14 Feb 2016 16:36:04 +0000 (+0000)
Subject: Add remark about backport obstacle.
X-Git-Tag: 2.5.0-alpha~2073
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b4551dea9bc75234b5d9dee70829f1de252496f;p=thirdparty%2Fapache%2Fhttpd.git

Add remark about backport obstacle.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730351 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c
index 8fa4b92432f..5690fd7eff8 100644
--- a/modules/ssl/ssl_engine_init.c
+++ b/modules/ssl/ssl_engine_init.c
@@ -489,6 +489,10 @@ static void ssl_set_ctx_protocol_option(server_rec *s,
         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 "