Author: is
Date: 2011-11-01 14:20:43 +0000 (Tue, 01 Nov 2011)
New Revision: 4259

Modified:
branches/stable-1.0/
branches/stable-1.0/src/core/ngx_string.c
Log:
Merging r4210:

Fixed utf8 decode (ticket #25).

Patch by Alexey Kuts.



Property changes on: branches/stable-1.0
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143,4147-4152,4154-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209,4212,4219-4220,4229-4230,4232,4235,4237
+ /trunk:3960-3974,3977-3987,3991-3996,3998,4003-4007,4009-4013,4015-4018,4020,4023,4025-4027,4034-4065,4073,4077,4086-4090,4094-4102,4106-4108,4113-4114,4129-4137,4143,4147-4152,4154-4158,4177,4179,4182-4184,4186-4187,4189-4205,4207,4209-4210,4212,4219-4220,4229-4230,4232,4235,4237

Modified: branches/stable-1.0/src/core/ngx_string.c
===================================================================
--- branches/stable-1.0/src/core/ngx_string.c 2011-11-01 14:19:13 UTC (rev 4258)
+++ branches/stable-1.0/src/core/ngx_string.c 2011-11-01 14:20:43 UTC (rev 4259)
@@ -1211,19 +1211,19 @@

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;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel