From: Graham Leggett <minfrin@apache.org>
Date: Sun, 2 Sep 2007 20:08:56 +0000 (+0000)
Subject: Move the accessenable variable into the private ssi_internal_ctx structure
X-Git-Tag: 2.3.0~1462
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1671b849dc6326d1fe869e7096e72c506792716;p=thirdparty%2Fapache%2Fhttpd.git

Move the accessenable variable into the private ssi_internal_ctx structure
instead of the public include_ctx_t structure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@572136 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 11357b760e1..db8b5faa946 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -192,6 +192,8 @@ struct ssi_internal_ctx {
     const char   *undefined_echo;
     apr_size_t    undefined_echo_len;
 
+    int         accessenable;    /* is using the access tests allowed? */
+
 #ifdef DEBUG_INCLUDE
     struct {
         ap_filter_t *f;
@@ -1030,7 +1032,7 @@ static int get_ptoken(include_ctx_t *ctx, const char **parse, token_t *token, to
         TYPE_TOKEN(token, TOKEN_LT);
         return 0;
     case '-':
-        if (**parse == 'A' && (ctx->accessenable)) {
+        if (**parse == 'A' && (ctx->intern->accessenable)) {
             TYPE_TOKEN(token, TOKEN_ACCESS);
             ++*parse;
             return 0;
@@ -3571,7 +3573,7 @@ static apr_status_t includes_filter(ap_filter_t *f, apr_bucket_brigade *b)
         if (ap_allow_options(r) & OPT_INCNOEXEC) {
             ctx->flags |= SSI_FLAG_NO_EXEC;
         }
-        ctx->accessenable = conf->accessenable;
+        intern->accessenable = conf->accessenable;
 
         ctx->if_nesting_level = 0;
         intern->re = NULL;
diff --git a/modules/filters/mod_include.h b/modules/filters/mod_include.h
index d357a49995a..74ff2bd1e3b 100644
--- a/modules/filters/mod_include.h
+++ b/modules/filters/mod_include.h
@@ -97,8 +97,6 @@ typedef struct {
     /* pointer to internal (non-public) data, don't touch */
     struct ssi_internal_ctx *intern;
 
-    /* is using the access tests allowed? */
-    int         accessenable;
 } include_ctx_t;
 
 typedef apr_status_t (include_handler_fn_t)(include_ctx_t *, ap_filter_t *,