Mercurial > hg > nginx

diff src/http/ngx_http_parse.c @ 1585:4435ca2e467d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge_slashes
author Igor Sysoev <igor@sysoev.ru>
date Thu, 18 Oct 2007 11:36:58 +0000
parents 25427a0e9559
children 364587232429
line wrap: on
line diff
--- 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_requ
             switch(ch) {
 #if (NGX_WIN32)
             case '\\':
+                break;
 #endif
             case '/':
+                if (merge_slashes) {
+                    *u++ = ch;
+                }
                 break;
             case '.':
                 state = sw_dot;