Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > caf339018a6654e52c7cc23d1db11db5 > files > 62

apache-2.2.9-12.9mdv2009.0.src.rpm

Index: server/core.c
===================================================================
--- server/core.c	(revision 780727)
+++ server/core.c	(working copy)
@@ -665,7 +665,12 @@
      * inverted, such that the exposed semantics match that of
      * OPT_INCNOEXEC; i.e., the bit is only enabled if exec= is *not*
      * permitted. */
-    return conf->opts ^ OPT_INC_WITH_EXEC;
+    if (conf->opts & OPT_INCLUDES) {
+        return conf->opts ^ OPT_INC_WITH_EXEC;
+    }
+    else {
+        return conf->opts;
+    }
 }
 
 AP_DECLARE(int) ap_allow_overrides(request_rec *r)