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 26f8723f071b721c04b9c1b75c20dd4448d428cf..0e3dd001970077adbe57be2a895a2682500438bb 100644 (file)
--- 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;
     }