summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2010-03-31 21:04:34 +0200
committerGraham Leggett <minfrin@apache.org>2010-03-31 21:04:34 +0200
commit1688cae4cfc9bde82a9a8fe1398726b97a91371b (patch)
tree80edee6b4ecb5f0d8ea068fd90ca2994b0734ec7 /include
parentUpdate. (diff)
downloadapache2-1688cae4cfc9bde82a9a8fe1398726b97a91371b.tar.xz
apache2-1688cae4cfc9bde82a9a8fe1398726b97a91371b.zip
Add the missing header file from r928916.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@929663 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-rw-r--r--include/http_config.h23
1 files changed, 23 insertions, 0 deletions
diff --git a/include/http_config.h b/include/http_config.h
index ff6e5e1732..dd78e04cb7 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -64,6 +64,13 @@ enum cmd_how {
TAKE13, /**< one or three arguments */
TAKE_ARGV /**< an argc and argv are passed */
};
+
+enum strict_how {
+ AP_OPTIONAL, /* directory and file wildcards succeed on no-match */
+ AP_MIXED, /* directory wildcards fail, file wildcards succeed on no match */
+ AP_STRICT /* directory and file wildcards fail on no-match */
+};
+
/**
* This structure is passed to a command which is being invoked,
* to carry a large variety of miscellaneous data which is all of
@@ -906,6 +913,22 @@ AP_CORE_DECLARE(const char *) ap_init_virtual_host(apr_pool_t *p,
* @param conftree The root node of the created config tree
* @param p Pool for general allocation
* @param ptemp Pool for temporary allocation
+ * @param strict Whether a no-match wildcard should be fatal
+ */
+AP_DECLARE(const char *) ap_process_resource_config_ex(server_rec *s,
+ const char *fname,
+ ap_directive_t **conftree,
+ apr_pool_t *p,
+ apr_pool_t *ptemp,
+ enum strict_how strict);
+
+/**
+ * Process the config file for Apache
+ * @param s The server rec to use for the command parms
+ * @param fname The name of the config file
+ * @param conftree The root node of the created config tree
+ * @param p Pool for general allocation
+ * @param ptemp Pool for temporary allocation
*/
AP_DECLARE(const char *) ap_process_resource_config(server_rec *s,
const char *fname,