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 09a93991eb10efecfeadb7e234f2f2027e16f2d3..440c75bca6fa25efd8243a8c38215bac7d1a1421 100644 (file)
--- 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);
     }