diff options
| author | Yann Ylavic <ylavic@apache.org> | 2019-10-25 15:53:34 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2019-10-25 15:53:34 +0200 |
| commit | 76957c414970460e336d86fa2bc5c8c4f3599b2f (patch) | |
| tree | e974b9d9543c81bfdf1467c866a2496d06cdb8af /modules | |
| parent | update after backport of current mod_md (diff) | |
| download | apache2-76957c414970460e336d86fa2bc5c8c4f3599b2f.tar.xz apache2-76957c414970460e336d86fa2bc5c8c4f3599b2f.zip | |
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
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ssl/ssl_engine_config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index 26f8723f07..0e3dd00197 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; } |