summaryrefslogtreecommitdiffstats
path: root/include/http_config.h
diff options
context:
space:
mode:
authorPaul Querna <pquerna@apache.org>2004-07-14 08:36:42 +0200
committerPaul Querna <pquerna@apache.org>2004-07-14 08:36:42 +0200
commit9d66007aa2676fad84ac1205cc5032e2561336b5 (patch)
treef6522fe4b38606ff6b21bb263fb11a4eab6f89a2 /include/http_config.h
parentAdd the new directive NWSSLUpgradeable to mod_nw_ssl to allow a non-secure co... (diff)
downloadapache2-9d66007aa2676fad84ac1205cc5032e2561336b5.tar.xz
apache2-9d66007aa2676fad84ac1205cc5032e2561336b5.zip
Added 'AllowOverride Options=Indexes,MultiViews' to give an admin better
control over what options can be used in .htaccess files. PR: 29310 Submitted by: Tom Alsberg <alsbergt-apache cs.huji.ac.il> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104283 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/http_config.h')
-rw-r--r--include/http_config.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/http_config.h b/include/http_config.h
index 31b6dd6502..41287de99a 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -291,6 +291,9 @@ struct cmd_parms_struct {
struct ap_conf_vector_t *context;
/** directive with syntax error */
const ap_directive_t *err_directive;
+
+ /** Which allow-override-opts bits are set */
+ int override_opts;
};
/**
@@ -854,6 +857,7 @@ AP_CORE_DECLARE(ap_conf_vector_t*) ap_create_conn_config(apr_pool_t *p);
*/
AP_CORE_DECLARE(int) ap_parse_htaccess(ap_conf_vector_t **result,
request_rec *r, int override,
+ int override_opts,
const char *path,
const char *access_name);