From: Igor Sysoev <igor@sysoev.ru>
Date: Sat, 14 Mar 2009 19:24:17 +0000 (+0000)
Subject: fix case when regex locaiton runs the second time via internal redirect
X-Git-Tag: release-0.7.42~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=c7e87af678d43610c9ec82cc398b7133b9408580;p=nginx.git

fix case when regex locaiton runs the second time via internal redirect
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 2d4feab75..66698d525 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1378,13 +1378,15 @@ ngx_http_core_find_location(ngx_http_request_t *r)
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                            "test location: ~ \"%V\"", &(*clcfp)->name);
 
-            if ((*clcfp)->captures && r->captures == NULL) {
+            if ((*clcfp)->captures) {
 
                 len = (NGX_HTTP_MAX_CAPTURES + 1) * 3;
 
-                r->captures = ngx_palloc(r->pool, len * sizeof(int));
                 if (r->captures == NULL) {
-                    return NGX_ERROR;
+                    r->captures = ngx_palloc(r->pool, len * sizeof(int));
+                    if (r->captures == NULL) {
+                        return NGX_ERROR;
+                    }
                 }
             }