diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-14 16:13:15 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-14 16:13:15 +0000 |
| commit | 9e4f24d33f2d5dbcfb39c980ed21715eb20d6cc1 (patch) | |
| tree | 7056746583daf1c1786475664355e9a77e2d2ebd /src | |
| parent | 13f1b5adee1af73e801facf68c229c6e045b0a23 (diff) | |
| download | nginx-9e4f24d33f2d5dbcfb39c980ed21715eb20d6cc1.tar.gz nginx-9e4f24d33f2d5dbcfb39c980ed21715eb20d6cc1.tar.bz2 | |
Merge of r4280:
Reverted incorrect change in internal md5 (part of r3928).
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_md5.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ngx_md5.c b/src/core/ngx_md5.c index 09a93991e..440c75bca 100644 --- a/src/core/ngx_md5.c +++ b/src/core/ngx_md5.c @@ -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); } |