Mercurial > hg > nginx

changeset 4288:0f2797e3399e stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4280: Reverted incorrect change in internal md5 (part of r3928).
author Igor Sysoev <igor@sysoev.ru>
date Mon, 14 Nov 2011 16:13:15 +0000
parents 7740d2a8d55b
children d0dcaff8862b
files src/core/ngx_md5.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_md5.c
+++ b/src/core/ngx_md5.c
@@ -47,7 +47,8 @@ ngx_md5_update(ngx_md5_t *ctx, const voi
             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);
     }