From 3a05349e0afd0faed9c69c6584afe2b002748b73 Mon Sep 17 00:00:00 2001 From: brenosilva Date: Fri, 22 Jun 2012 12:58:46 +0000 Subject: [PATCH] Fix setting key len for child conf --- apache2/apache2_config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apache2/apache2_config.c b/apache2/apache2_config.c index 13393e5f..fb755a14 100644 --- a/apache2/apache2_config.c +++ b/apache2/apache2_config.c @@ -136,6 +136,7 @@ void *create_directory_config(apr_pool_t *mp, char *path) dcfg->col_timeout = NOT_SET; dcfg->crypto_key = NOT_SET_P; + dcfg->crypto_key_len = NOT_SET; dcfg->crypto_key_add = NOT_SET; dcfg->crypto_param_name = NOT_SET_P; dcfg->encryption_is_enabled = NOT_SET; @@ -554,6 +555,8 @@ void *merge_directory_configs(apr_pool_t *mp, void *_parent, void *_child) /* Encryption */ merged->crypto_key = (child->crypto_key == NOT_SET_P ? parent->crypto_key : child->crypto_key); + merged->crypto_key_len = (child->crypto_key_len == NOT_SET + ? parent->crypto_key_len : child->crypto_key_len); merged->crypto_key_add = (child->crypto_key_add == NOT_SET ? parent->crypto_key_add : child->crypto_key_add); merged->crypto_param_name = (child->crypto_param_name == NOT_SET_P