Replace pre_htaccess hook with more flexible open_htaccess hook

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

1 files changed, 22 insertions, 6 deletions

diff --git a/include/http_config.h b/include/http_config.h
index 52dce72402..c93c3b2ee7 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -1322,13 +1322,29 @@ AP_DECLARE_HOOK(int,quick_handler,(request_rec *r, int lookup_uri))
 AP_DECLARE_HOOK(void,optional_fn_retrieve,(void))
 
 /**
- * Allow modules to perform a check immediately prior to opening htaccess.
+ * Allow modules to open htaccess files or perform operations before doing so
  * @param r The current request
- * @param filename The htaccess file which will be processed
- * @return HTTP status code to fail the operation, or DECLINED to let later
- * modules decide
- */
-AP_DECLARE_HOOK(int,pre_htaccess,(request_rec *r, const char *filename))
+ * @param dir_name The directory for which the htaccess file should be opened
+ * @param access_name The filename  for which the htaccess file should be opened
+ * @param conffile Where the pointer to the opened ap_configfile_t must be
+ *        stored
+ * @param full_name Where the full file name of the htaccess file must be
+ *        stored.
+ * @return APR_SUCCESS on success,
+ *         APR_ENOENT or APR_ENOTDIR if no htaccess file exists,
+ *         AP_DECLINED to let later modules do the opening,
+ *         any other error code on error.
+ */
+AP_DECLARE_HOOK(apr_status_t,open_htaccess,
+                (request_rec *r, const char *dir_name, const char *access_name,
+                 ap_configfile_t **conffile, const char **full_name))
+
+/**
+ * Core internal function, use ap_run_open_htaccess() instead.
+ */
+apr_status_t ap_open_htaccess(request_rec *r, const char *dir_name,
+        const char *access_name, ap_configfile_t **conffile,
+        const char **full_name);
 
 /**
  * A generic pool cleanup that will reset a pointer to NULL. For use with