summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2008-01-08 17:23:25 +0000
committerIgor Sysoev <igor@sysoev.ru>2008-01-08 17:23:25 +0000
commit024256d44d745c9b4ed468a169a0e0235986a8d5 (patch)
tree100b2b3adffe101caf63d5ab57c7fc86118ea4cd
parent07dac6cdeb217f75588bf8e85ebff75be08711d0 (diff)
downloadnginx-024256d44d745c9b4ed468a169a0e0235986a8d5.tar.gz
r1739 merge:
fix merge_slashes
-rw-r--r--src/http/ngx_http_parse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
index 66bd36eea..b83810d2e 100644
--- a/src/http/ngx_http_parse.c
+++ b/src/http/ngx_http_parse.c
@@ -1039,7 +1039,7 @@ ngx_http_parse_complex_uri(ngx_http_request_t *r, ngx_uint_t merge_slashes)
break;
#endif
case '/':
- if (merge_slashes) {
+ if (!merge_slashes) {
*u++ = ch;
}
break;