diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-10-18 11:36:58 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-10-18 11:36:58 +0000 |
| commit | 8decab3dd9bb0e9c5313be590bb09f5b54ff7cb7 (patch) | |
| tree | 6bdf42d1bbabb7f197c9e3448add38aed9d78f2b /src/http/ngx_http_parse.c | |
| parent | 4c5207fd563eda01384ede94758ff333879abffc (diff) | |
| download | nginx-8decab3dd9bb0e9c5313be590bb09f5b54ff7cb7.tar.gz nginx-8decab3dd9bb0e9c5313be590bb09f5b54ff7cb7.zip | |
merge_slashes
Diffstat (limited to 'src/http/ngx_http_parse.c')
| -rw-r--r-- | src/http/ngx_http_parse.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c index 40e7700d3..256bd9be9 100644 --- a/src/http/ngx_http_parse.c +++ b/src/http/ngx_http_parse.c @@ -908,7 +908,7 @@ header_done: ngx_int_t -ngx_http_parse_complex_uri(ngx_http_request_t *r) +ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes) { u_char c, ch, decoded, *p, *u; enum { @@ -1016,8 +1016,12 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r) switch(ch) { #if (NGX_WIN32) case '\\': + break; #endif case '/': + if (merge_slashes) { + *u++ = ch; + } break; case '.': state = sw_dot; |