summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/aaa/mod_authz_core.c4
-rw-r--r--modules/filters/mod_filter.c5
-rw-r--r--modules/filters/mod_include.c2
-rw-r--r--modules/loggers/mod_log_config.c7
-rw-r--r--modules/mappers/mod_rewrite.c7
-rw-r--r--modules/metadata/mod_headers.c3
-rw-r--r--modules/metadata/mod_setenvif.c3
-rw-r--r--modules/ssl/ssl_engine_config.c2
8 files changed, 13 insertions, 20 deletions
diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index 4a8be33297..c81eb8eaec 100644
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -1034,12 +1034,12 @@ static const char *expr_parse_config(cmd_parms *cmd, const char *require_line,
const void **parsed_require_line)
{
const char *expr_err = NULL;
- ap_expr_info_t *expr = ap_expr_parse_cmd(cmd, require_line, &expr_err, NULL);
+ ap_expr_info_t *expr = ap_expr_parse_cmd(cmd, require_line, 0, &expr_err,
+ NULL);
if (expr_err)
return "Cannot parse expression in require line";
- expr->module_index = APLOG_MODULE_INDEX;
*parsed_require_line = expr;
return NULL;
diff --git a/modules/filters/mod_filter.c b/modules/filters/mod_filter.c
index 5dd394332a..8dbbf8cb3c 100644
--- a/modules/filters/mod_filter.c
+++ b/modules/filters/mod_filter.c
@@ -427,20 +427,17 @@ static const char *filter_provider(cmd_parms *cmd, void *CFG,
if (!provider_frec) {
return apr_psprintf(cmd->pool, "Unknown filter provider %s", pname);
}
- node = ap_expr_parse_cmd(cmd, expr, &err, NULL);
+ node = ap_expr_parse_cmd(cmd, expr, 0, &err, NULL);
if (err) {
return apr_pstrcat(cmd->pool,
"Error parsing FilterProvider expression:", err,
NULL);
}
- node->module_index = APLOG_MODULE_INDEX;
-
provider = apr_palloc(cmd->pool, sizeof(ap_filter_provider_t));
provider->expr = node;
provider->frec = provider_frec;
provider->next = frec->providers;
frec->providers = provider;
-
return NULL;
}
static const char *filter_chain(cmd_parms *cmd, void *CFG, const char *arg)
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 981838d279..f4cf28331b 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1597,7 +1597,7 @@ static int parse_ap_expr(include_ctx_t *ctx, const char *expr, int *was_error)
expr_info.filename = ctx->r->filename;
expr_info.line_number = 0;
expr_info.module_index = APLOG_MODULE_INDEX;
- expr_info.flags = AP_EXPR_FLAGS_RESTRICTED;
+ expr_info.flags = AP_EXPR_FLAG_RESTRICTED;
err = ap_expr_parse(ctx->r->pool, ctx->r->pool, &expr_info, expr,
include_expr_lookup);
if (err) {
diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index 9e83e661c1..6218bd16a2 100644
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -1254,12 +1254,11 @@ static const char *add_custom_log(cmd_parms *cmd, void *dummy, const char *fn,
const char *err;
if ((envclause[5] == '\0'))
return "missing condition";
- cls->condition_expr = ap_expr_parse_cmd(cmd, &envclause[5], &err,
- NULL);
+ cls->condition_expr = ap_expr_parse_cmd(cmd, &envclause[5],
+ AP_EXPR_FLAG_DONT_VARY,
+ &err, NULL);
if (err)
return err;
- cls->condition_expr->module_index = APLOG_MODULE_INDEX;
- cls->condition_expr->flags |= AP_EXPR_FLAGS_DONT_VARY;
}
else {
return "error in condition clause";
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index cd14687afb..45363394ac 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3322,13 +3322,12 @@ static const char *cmd_rewritecond(cmd_parms *cmd, void *in_dconf,
newcond->regexp = regexp;
}
else if (newcond->ptype == CONDPAT_AP_EXPR) {
- newcond->expr = ap_expr_parse_cmd(cmd, a2, &err, NULL);
+ unsigned int flags = newcond->flags & CONDFLAG_NOVARY ?
+ AP_EXPR_FLAG_DONT_VARY : 0;
+ newcond->expr = ap_expr_parse_cmd(cmd, a2, flags, &err, NULL);
if (err)
return apr_psprintf(cmd->pool, "RewriteCond: cannot compile "
"expression \"%s\": %s", a2, err);
- newcond->expr->module_index = rewrite_module.module_index;
- if (newcond->flags & CONDFLAG_NOVARY)
- newcond->expr->flags |= AP_EXPR_FLAGS_DONT_VARY;
}
return NULL;
diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index 40fe34e768..b82281ea0c 100644
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -492,13 +492,12 @@ static APR_INLINE const char *header_inout_cmd(cmd_parms *cmd,
}
else {
const char *err = NULL;
- expr = ap_expr_parse_cmd(cmd, envclause, &err, NULL);
+ expr = ap_expr_parse_cmd(cmd, envclause, 0, &err, NULL);
if (err) {
return apr_pstrcat(cmd->pool,
"Can't parse envclause/expression: ", err,
NULL);
}
- expr->module_index = APLOG_MODULE_INDEX;
}
}
diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index 53f78b4811..423258010f 100644
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -477,11 +477,10 @@ static const char *add_setenvifexpr(cmd_parms *cmd, void *mconfig,
new->regex = NULL;
new->pattern = NULL;
new->preg = NULL;
- new->expr = ap_expr_parse_cmd(cmd, expr, &err, NULL);
+ new->expr = ap_expr_parse_cmd(cmd, expr, 0, &err, NULL);
if (err)
return apr_psprintf(cmd->pool, "Could not parse expression \"%s\": %s",
expr, err);
- new->expr->module_index = setenvif_module.module_index;
return add_envvars(cmd, args, new);
}
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 6042bacb2c..20c2e8f3cf 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -1160,7 +1160,7 @@ const char *ssl_cmd_SSLRequire(cmd_parms *cmd,
ssl_require_t *require;
const char *errstring;
- info->flags = AP_EXPR_FLAGS_SSL_EXPR_COMPAT;
+ info->flags = AP_EXPR_FLAG_SSL_EXPR_COMPAT;
info->filename = cmd->directive->filename;
info->line_number = cmd->directive->line_num;
info->module_index = APLOG_MODULE_INDEX;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 05:45:41 +0100