commit 97860160760773b329fb36f9b6253ba8e31dc141
author Igor Sysoev <igor@sysoev.ru> Tue Feb 10 16:03:42 2009 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Feb 10 16:03:42 2009 +0000
tree 0d3a60c3e2e83f4037ed4df820eaa7f3b45ab4a7
parent c43beec76f16a9bf8e050b4872b0cc3b692c7db0

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

src/http/ngx_http_script.c

diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index dd9db62..3afa604 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -244,10 +244,21 @@
 
         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++;
         }