From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 7 Sep 2009 12:03:14 +0000 (+0000)
Subject: merge r3092:
X-Git-Tag: release-0.5.38~1
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=34953132b17253046bade65591fa1adee5dd98a2;p=nginx.git

merge r3092:

handle "/../" case more reliably
---

diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index de061c91d..5d089302b 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -1123,11 +1123,15 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
 #endif
             case '/':
                 state = sw_slash;
-                u -= 4;
-                if (u < r->uri.data) {
-                    return NGX_HTTP_PARSE_INVALID_REQUEST;
-                }
-                while (*(u - 1) != '/') {
+                u -= 5;
+                for ( ;; ) {
+                    if (u < r->uri.data) {
+                        return NGX_HTTP_PARSE_INVALID_REQUEST;
+                    }
+                    if (*u == '/') {
+                        u++;
+                        break;
+                    }
                     u--;
                 }
                 break;