Merge of r4280:

Reverted incorrect change in internal md5 (part of r3928).
This commit is contained in:
Igor Sysoev 2011-11-14 16:13:15 +00:00
parent 8b346e57ee
commit 199832cc75
1 changed files with 2 additions and 1 deletions

View File

@ -47,7 +47,8 @@ ngx_md5_update(ngx_md5_t *ctx, const void *data, size_t size)
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);
}