# HG changeset patch # User Igor Sysoev # Date 1321287195 0 # Node ID 0f2797e3399e16b95ba097b742d2e01f092e3f38 # Parent 7740d2a8d55bc5c5ebdb9b58487cceb0a58f41f0 Merge of r4280: Reverted incorrect change in internal md5 (part of r3928). diff --git a/src/core/ngx_md5.c b/src/core/ngx_md5.c --- 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); }