diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 12:03:14 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-09-07 12:03:14 +0000 |
commit | 34953132b17253046bade65591fa1adee5dd98a2 (patch) | |
tree | 9c9336abc6d7618e21df865f00966ed6d45a5738 | |
parent | 6660f82e1755d881a629c542787899e79c7ae395 (diff) | |
download | nginx-34953132b17253046bade65591fa1adee5dd98a2.tar.gz |
merge r3092:
handle "/../" case more reliably
-rw-r--r-- | src/http/ngx_http_parse.c | 14 |
1 files changed, 9 insertions, 5 deletions
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; |