Author: is
Date: 2011-11-14 16:13:15 +0000 (Mon, 14 Nov 2011)
New Revision: 4289

Modified:
branches/stable-1.0/
branches/stable-1.0/src/core/ngx_md5.c
Log:
Merge of r4280:

Reverted incorrect change in internal md5 (part of r3928).



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-4210,4212,4219-4220,4229-4230,4232,4235-4237,4268
+ /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,4268,4280

Modified: branches/stable-1.0/src/core/ngx_md5.c
===================================================================
--- branches/stable-1.0/src/core/ngx_md5.c 2011-11-14 16:12:25 UTC (rev 4288)
+++ branches/stable-1.0/src/core/ngx_md5.c 2011-11-14 16:13:15 UTC (rev 4289)
@@ -47,7 +47,8 @@
return;
}

- data = ngx_cpymem(&ctx->buffer[used], data, free);
+ ngx_memcpy(&ctx->buffer[used], data, free);
+ data = (u_char *) data + free;
size -= free;
(void) ngx_md5_body(ctx, ctx->buffer, 64);
}

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