Mercurial > hg > nginx

changeset 3121:bd2573c97e4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
handle "/../" case more reliably
author Igor Sysoev <igor@sysoev.ru>
date Mon, 14 Sep 2009 07:42:01 +0000
parents 40b8b398dbbc
children 3e994ac670dc
files src/http/ngx_http_parse.c
diffstat 1 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -1134,11 +1134,15 @@ ngx_http_parse_complex_uri(ngx_http_requ
 #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;