From e7f4e16eaa0b4a6c3d7254f911a4f3b022ae5192 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Thu, 2 Jul 2009 21:30:36 +0000 Subject: [PATCH] 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 --- STATUS | 5 ----- server/core.c | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/STATUS b/STATUS index 5d073beae20..b5512f1a2ad 100644 --- 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 7ddb05892b9..ab43719779d 100644 --- 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) -- 2.47.2