From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 1 Nov 2011 14:20:43 +0000 (+0000)
Subject: Merging r4210:
X-Git-Tag: release-1.0.9~3
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=a49c69306dea641fc55f0e53955399723b7999ed;p=nginx.git

Merging r4210:

Fixed utf8 decode (ticket #25).

Patch by Alexey Kuts.
---

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;