You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2009/05/10 16:18:39 UTC
svn commit: r773342 - /httpd/httpd/trunk/server/core.c
Author: jorton
Date: Sun May 10 14:18:39 2009
New Revision: 773342
URL: http://svn.apache.org/viewvc?rev=773342&view=rev
Log:
* 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!).
Modified:
httpd/httpd/trunk/server/core.c
Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=773342&r1=773341&r2=773342&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Sun May 10 14:18:39 2009
@@ -239,12 +239,13 @@
| 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;
}
}