commit b5fd7d5041f80f5c920b0954b5036a8ec1dc06f9
author Piotr Sikora <piotr@cloudflare.com> Thu May 02 03:26:36 2013 -0700
committer Piotr Sikora <piotr@cloudflare.com> Thu May 02 03:26:36 2013 -0700
tree 557beabfea93de3dd4b2e2c70877c270367dc819
parent a38455a7f3924bb1b422dd012e4e7c6243e15e39

PCRE: retain input pattern for all regular expressions.

Previously, input pattern was kept only for regular expressions
with named captures, which resulted in error log entries without
input pattern for PCRE errors that occured while processing
regular expressions without them.

Signed-off-by: Piotr Sikora <piotr@cloudflare.com>

src/http/ngx_http_variables.c

diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
index 6f1e034..0b1a334 100644
--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -2257,6 +2257,7 @@
 
     re->regex = rc->regex;
     re->ncaptures = rc->captures;
+    re->name = rc->pattern;
 
     cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
     cmcf->ncaptures = ngx_max(cmcf->ncaptures, re->ncaptures);
@@ -2274,7 +2275,6 @@
 
     re->variables = rv;
     re->nvariables = n;
-    re->name = rc->pattern;
 
     size = rc->name_size;
     p = rc->names;