# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1199813005 0
# Node ID 8ca85249de243136949f343c2b87b583a797a25c
# Parent  0e4c85e25ed54aaba6a95088be95ef09e3803f8d
r1739 merge:

fix merge_slashes

diff --git a/src/http/ngx_http_parse.c b/src/http/ngx_http_parse.c
--- 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_requ
                 break;
 #endif
             case '/':
-                if (merge_slashes) {
+                if (!merge_slashes) {
                     *u++ = ch;
                 }
                 break;