From: Igor Sysoev <igor@sysoev.ru>
Date: Wed, 1 Apr 2009 16:31:18 +0000 (+0000)
Subject: r2499 merge:
X-Git-Tag: release-0.6.36~7
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=7ca140c630c33733b4f4eb474faf9be28cb8d435;p=nginx.git

r2499 merge:

fix /?new=arg?old=arg redirect case
---

diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index acd867fdb..fc980f4b0 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -244,10 +244,21 @@ ngx_http_script_compile(ngx_http_script_compile_t *sc)
 
         name.data = &sc->source->data[i];
 
-        while (i < sc->source->len
-               && sc->source->data[i] != '$'
-               && !(sc->source->data[i] == '?' && sc->compile_args))
-        {
+        while (i < sc->source->len) {
+
+            if (sc->source->data[i] == '$') {
+                break;
+            }
+
+            if (sc->source->data[i] == '?') {
+
+                sc->args = 1;
+
+                if (sc->compile_args) {
+                    break;
+                }
+            }
+
             i++;
             name.len++;
         }