From cb56fba0f15a2c9f1a665efb0bcbf7286e8c26d3 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Sun, 10 May 2009 14:18:39 +0000 Subject: [PATCH] * server/core.c (merge_core_dir_configs): Tweak logic and comment wording in the special-case for Includes merging such that the code and comment read the same. No functional change (intended!). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@773342 13f79535-47bb-0310-9956-ffa450edef68 --- server/core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/core.c b/server/core.c index 8c0a828159..52399784e5 100644 --- a/server/core.c +++ b/server/core.c @@ -239,12 +239,13 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv) | new->opts_remove; conf->opts = (conf->opts & ~conf->opts_remove) | conf->opts_add; - /* if Includes was enabled without exec in the new config, but - * was enabled with exec in the base, then disable exec in the - * resulting options. */ - if ((base->opts & OPT_INC_WITH_EXEC) - && (new->opts & OPT_INC_WITH_EXEC) == 0 - && (new->opts & OPT_INCLUDES)) { + /* If Includes was enabled with exec in the base config, but + * was enabled without exec in the new config, then disable + * exec in the merged set. */ + if (((base->opts & (OPT_INCLUDES|OPT_INC_WITH_EXEC)) + == (OPT_INCLUDES|OPT_INC_WITH_EXEC)) + && ((new->opts & (OPT_INCLUDES|OPT_INC_WITH_EXEC)) + == OPT_INCLUDES)) { conf->opts &= ~OPT_INC_WITH_EXEC; } } -- 2.50.1