From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 8 Jan 2008 17:23:25 +0000 (+0000)
Subject: r1739 merge:
X-Git-Tag: release-0.5.35~3
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=024256d44d745c9b4ed468a169a0e0235986a8d5;p=nginx.git

r1739 merge:

fix merge_slashes
---

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;