additional (mod_perl test suite) OPT_INCLUDES compatibility

Submitted by: jorton
Reviewed by:  trawick, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790738 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 5d073beae2055c1f4baeb9821049126e4cde774b..b5512f1a2adc01086999bd7fab3987a4fb3629bb 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -93,11 +93,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * additional (mod_perl test suite) OPT_INCLUDES compatibility
-   trunk: N/A
-   2.2.x patch: http://people.apache.org/~trawick/mod_perl_more_compat.txt
-   +1: trawick, jorton, rpluem
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/server/core.c b/server/core.c
index 7ddb05892b9bf4aa87a84e7f71375bf6de938415..ab43719779d5b4e31def57b3d57dfbbc12a2b2fd 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -665,7 +665,12 @@ AP_DECLARE(int) ap_allow_options(request_rec *r)
      * 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)