summaryrefslogtreecommitdiffhomepage
path: root/src/core/ngx_string.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-02-01 14:52:25 +0000
committerIgor Sysoev <igor@sysoev.ru>2010-02-01 14:52:25 +0000
commitaf7e5336829540d80490fc4fa7153ce2efb95954 (patch)
tree3e5e0dfc8e736f6f579ede80f284930ae681c6b1 /src/core/ngx_string.c
parent30ee8008be32ec1b7229eff2bd0b2462146c480c (diff)
downloadnginx-af7e5336829540d80490fc4fa7153ce2efb95954.tar.gz
nginx-af7e5336829540d80490fc4fa7153ce2efb95954.tar.bz2
merge r3201, r3204, r3411:
ngx_http_autoindex_module fixes: *) reset cached dirent.d_type after stat() this fixes slash after link to a directory in ngx_http_autoindex_module; *) use cached dirent.d_type as hint on all systems the issues has been introduced in r2235 *) fix ngx_utf8_cpystrn(): it did not fully copy utf-8 string
Diffstat (limited to 'src/core/ngx_string.c')
-rw-r--r--src/core/ngx_string.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 3456baa5c..f8b165731 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -1238,10 +1238,8 @@ ngx_utf8_cpystrn(u_char *dst, u_char *src, size_t n, size_t len)
break;
}
- len--;
-
while (src < next) {
- *++dst = *++src;
+ *dst++ = *src++;
len--;
}
}