From a3dca551c17921ad535bdab10d2c4e05a62444e3 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Fri, 18 Apr 2014 11:47:06 +0000 Subject: [PATCH] Move two variable assignments off the fast path. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588448 13f79535-47bb-0310-9956-ffa450edef68 --- server/util_expr_eval.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c index d99212001f..aa7e971279 100644 --- a/server/util_expr_eval.c +++ b/server/util_expr_eval.c @@ -885,7 +885,7 @@ AP_DECLARE(const char *) ap_expr_str_exec_re(request_rec *r, { ap_expr_eval_ctx_t ctx; int dont_vary, rc; - const char *tmp_source = NULL, *vary_this = NULL; + const char *tmp_source, *vary_this; ap_regmatch_t tmp_pmatch[AP_MAX_REG_MATCH]; const char *result; @@ -897,6 +897,9 @@ AP_DECLARE(const char *) ap_expr_str_exec_re(request_rec *r, return (const char *)info->root_node->node_arg1; } + tmp_source = NULL; + vary_this = NULL; + dont_vary = (info->flags & AP_EXPR_FLAG_DONT_VARY); ctx.r = r; -- 2.40.0