Add AllowOverrideList directive and documentation

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

4 files changed, 15 insertions, 1 deletions

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 2db7bac692..14ef8020a1 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -342,12 +342,15 @@
  *                         rename AP_EXPR_FLAGS_* -> AP_EXPR_FLAG_*
  * 20110702.1 (2.3.14-dev) Add ap_scan_script_header_err*_ex functions
  * 20110723.0 (2.3.14-dev) Revert addition of ap_ldap*
+ * 20110724.0 (2.3.14-dev) Add override_list as parameter to ap_parse_htaccess
+ *                         Add member override_list to cmd_parms_struct,
+ *                         core_dir_config and htaccess_result
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
 
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20110723
+#define MODULE_MAGIC_NUMBER_MAJOR 20110724
 #endif
 #define MODULE_MAGIC_NUMBER_MINOR 0                    /* 0...n */
 
diff --git a/include/http_config.h b/include/http_config.h
index ab7de2792b..26949b7fb2 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -28,6 +28,7 @@
 
 #include "util_cfgtree.h"
 #include "ap_config.h"
+#include "apr_tables.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -282,6 +283,8 @@ struct cmd_parms_struct {
     int override;
     /** Which allow-override-opts bits are set */
     int override_opts;
+    /** Table of directives allowed per AllowOverrideList */
+    apr_table_t *override_list;
     /** Which methods are <Limit>ed */
     apr_int64_t limited;
     /** methods which are limited */
@@ -1065,6 +1068,7 @@ AP_CORE_DECLARE(ap_conf_vector_t*) ap_create_conn_config(apr_pool_t *p);
  * @param r The request currently being served
  * @param override Which overrides are active
  * @param override_opts Which allow-override-opts bits are set
+ * @param override_list Table of directives allowed for override
  * @param path The path to the htaccess file
  * @param access_name The list of possible names for .htaccess files
  * int The status of the current request
@@ -1073,6 +1077,7 @@ AP_CORE_DECLARE(int) ap_parse_htaccess(ap_conf_vector_t **result,
                                        request_rec *r,
                                        int override,
                                        int override_opts,
+                                       apr_table_t *override_list,
                                        const char *path,
                                        const char *access_name);
 
diff --git a/include/http_core.h b/include/http_core.h
index f3644ad8ab..a41cf9b54f 100644
--- a/include/http_core.h
+++ b/include/http_core.h
@@ -31,6 +31,7 @@
 #include "apr_optional.h"
 #include "util_filter.h"
 #include "ap_expr.h"
+#include "apr_tables.h"
 
 #include "http_config.h"
 
@@ -601,6 +602,9 @@ typedef struct {
     /** per-dir log config */
     struct ap_logconf *log;
 
+    /** Table of directives allowed per AllowOverrideList */
+    apr_table_t *override_list;
+
 } core_dir_config;
 
 /* macro to implement off by default behaviour */
diff --git a/include/httpd.h b/include/httpd.h
index 38a469bb53..a9b82a2f6c 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -706,6 +706,8 @@ struct htaccess_result {
     int override;
     /** the override options allowed for the .htaccess file */
     int override_opts;
+    /** Table of allowed directives for override */
+    apr_table_t *override_list;
     /** the configuration directives */
     struct ap_conf_vector_t *htaccess;
     /** the next one, or NULL if no more; N.B. never change this */