summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-11-01 14:20:43 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-11-01 14:20:43 +0000
commita49c69306dea641fc55f0e53955399723b7999ed (patch)
treef69724121d5d6bfce6a739367f6dd2aebcae4192
parentd3769b1966ea0077360034b918275292d587e738 (diff)
downloadnginx-a49c69306dea641fc55f0e53955399723b7999ed.tar.gz
nginx-a49c69306dea641fc55f0e53955399723b7999ed.tar.bz2
Merging r4210:
Fixed utf8 decode (ticket #25). Patch by Alexey Kuts.
-rw-r--r--src/core/ngx_string.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 8f29e9070..29f8e0d67 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -1211,19 +1211,19 @@ ngx_utf8_decode(u_char **p, size_t n)
u = **p;
- if (u > 0xf0) {
+ if (u >= 0xf0) {
u &= 0x07;
valid = 0xffff;
len = 3;
- } else if (u > 0xe0) {
+ } else if (u >= 0xe0) {
u &= 0x0f;
valid = 0x7ff;
len = 2;
- } else if (u > 0xc0) {
+ } else if (u >= 0xc2) {
u &= 0x1f;
valid = 0x7f;