From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 14 Nov 2011 16:13:15 +0000 (+0000)
Subject: Merge of r4280:
X-Git-Tag: release-1.0.10~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=9e4f24d33f2d5dbcfb39c980ed21715eb20d6cc1;p=nginx.git

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
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);
     }