commit 8decab3dd9bb0e9c5313be590bb09f5b54ff7cb7
author Igor Sysoev <igor@sysoev.ru> Thu Oct 18 11:36:58 2007 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu Oct 18 11:36:58 2007 +0000
tree 6bdf42d1bbabb7f197c9e3448add38aed9d78f2b
parent 4c5207fd563eda01384ede94758ff333879abffc

merge_slashes

src/http/ngx_http_parse.c

diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index 40e7700..256bd9b 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -908,7 +908,7 @@
 
 
 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 @@
             switch(ch) {
 #if (NGX_WIN32)
             case '\\':
+                break;
 #endif
             case '/':
+                if (merge_slashes) {
+                    *u++ = ch;
+                }
                 break;
             case '.':
                 state = sw_dot;