summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2023-04-14 16:03:03 +0200
committerGraham Leggett <minfrin@apache.org>2023-04-14 16:03:03 +0200
commite6647e0dcbd8372919330b74a037a69d6cf6f0d0 (patch)
tree9ee0086893bc6437a59c2226a5feb91108a59740
parentcore: Be explicit if an enclosing directive contains a path or a (diff)
downloadapache2-e6647e0dcbd8372919330b74a037a69d6cf6f0d0.tar.xz
apache2-e6647e0dcbd8372919330b74a037a69d6cf6f0d0.zip
Include header file for the explicit regex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1909136 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--include/http_config.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/http_config.h b/include/http_config.h
index 39fe72aff8..8f150465a5 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -313,12 +313,9 @@ struct cmd_parms_struct {
apr_pool_t *temp_pool;
/** Server_rec being configured for */
server_rec *server;
- /** If configuring for a directory, pathname of that directory.
- * NOPE! That's what it meant previous to the existence of &lt;Files&gt;,
- * &lt;Location&gt; and regex matching. Now the only usefulness that can be
- * derived from this field is whether a command is being called in a
- * server context (path == NULL) or being called in a dir context
- * (path != NULL). */
+ /** If configuring for a directory, pathname of that directory. If the
+ * pathname is a regex, regex will be non-NULL below. If path is NULL,
+ * the directive is being called from a server context. */
char *path;
/** configuration command */
const command_rec *cmd;
@@ -331,6 +328,9 @@ struct cmd_parms_struct {
/** If the current directive is EXEC_ON_READ, this is the last
(non-EXEC_ON_READ) enclosing directive */
ap_directive_t *parent;
+
+ /** If the path is a regex, compiled regex will be not NULL. */
+ ap_regex_t *regex;
};
/**