* 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

diff --git a/server/core.c b/server/core.c
index 8c0a828159dada5cd60fc1b7a618892fe3ceab7d..52399784e5186de3f2073ed15ce9273fa3cf83fa 100644 (file)
--- 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;
         }
     }