httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r929663 - /httpd/httpd/trunk/include/http_config.h
Date Wed, 31 Mar 2010 19:04:34 GMT
Author: minfrin
Date: Wed Mar 31 19:04:34 2010
New Revision: 929663

URL: http://svn.apache.org/viewvc?rev=929663&view=rev
Log:
Add the missing header file from r928916.

Modified:
    httpd/httpd/trunk/include/http_config.h

Modified: httpd/httpd/trunk/include/http_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/http_config.h?rev=929663&r1=929662&r2=929663&view=diff
==============================================================================
--- httpd/httpd/trunk/include/http_config.h (original)
+++ httpd/httpd/trunk/include/http_config.h Wed Mar 31 19:04:34 2010
@@ -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_vi
  * @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,



Mime
View raw message