From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 25 Oct 2019 13:53:34 +0000 (+0000)
Subject: mod_ssl: follow up to r1868645 and r1868929.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1846
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76957c414970460e336d86fa2bc5c8c4f3599b2f;p=thirdparty%2Fapache%2Fhttpd.git

mod_ssl: follow up to r1868645 and r1868929.

Merge ->protocol_set.


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

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 26f8723f071..0e3dd001970 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -265,9 +265,11 @@ static void modssl_ctx_cfg_merge(apr_pool_t *p,
                                  modssl_ctx_t *mrg)
 {
     if (add->protocol_set) {
+        mrg->protocol_set = 1;
         mrg->protocol = add->protocol;
     }
     else {
+        mrg->protocol_set = base->protocol_set;
         mrg->protocol = base->protocol;
     }