summaryrefslogtreecommitdiffhomepage
path: root/src/core/ngx_string.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-01-26 15:09:55 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-01-26 15:09:55 +0000
commitccbe3f540e7c0e9fbd3644cd443bda620ed65358 (patch)
treeac785b01206a45f95d9af7dc602ecc293fa4f85d /src/core/ngx_string.h
parentafbff43edc7ab5276265f320188378108394c9ca (diff)
downloadnginx-ccbe3f540e7c0e9fbd3644cd443bda620ed65358.tar.gz
nginx-ccbe3f540e7c0e9fbd3644cd443bda620ed65358.tar.bz2
r2121, r2126 merge:
*) fix utf-8 names in autoindex *) rename ngx_utf_...() to ngx_utf8_...()
Diffstat (limited to 'src/core/ngx_string.h')
-rw-r--r--src/core/ngx_string.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ngx_string.h b/src/core/ngx_string.h
index 3514e52f3..dfb3bc4cc 100644
--- a/src/core/ngx_string.h
+++ b/src/core/ngx_string.h
@@ -151,9 +151,9 @@ u_char *ngx_hex_dump(u_char *dst, u_char *src, size_t len);
void ngx_encode_base64(ngx_str_t *dst, ngx_str_t *src);
ngx_int_t ngx_decode_base64(ngx_str_t *dst, ngx_str_t *src);
-uint32_t ngx_utf_decode(u_char **p, size_t n);
-size_t ngx_utf_length(u_char *p, size_t n);
-u_char *ngx_utf_cpystrn(u_char *dst, u_char *src, size_t n);
+uint32_t ngx_utf8_decode(u_char **p, size_t n);
+size_t ngx_utf8_length(u_char *p, size_t n);
+u_char *ngx_utf8_cpystrn(u_char *dst, u_char *src, size_t n, size_t len);
#define NGX_ESCAPE_URI 0