Mercurial > hg > nginx-quic
comparison src/core/ngx_md5.c @ 4288:0f2797e3399e stable-1.0
Merge of r4280:
Reverted incorrect change in internal md5 (part of r3928).
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 14 Nov 2011 16:13:15 +0000 |
parents | ce1ba4a312d7 |
children | 9eefb38f0005 |
comparison
equal
deleted
inserted
replaced
4287:7740d2a8d55b | 4288:0f2797e3399e |
---|---|
45 if (size < free) { | 45 if (size < free) { |
46 ngx_memcpy(&ctx->buffer[used], data, size); | 46 ngx_memcpy(&ctx->buffer[used], data, size); |
47 return; | 47 return; |
48 } | 48 } |
49 | 49 |
50 data = ngx_cpymem(&ctx->buffer[used], data, free); | 50 ngx_memcpy(&ctx->buffer[used], data, free); |
51 data = (u_char *) data + free; | |
51 size -= free; | 52 size -= free; |
52 (void) ngx_md5_body(ctx, ctx->buffer, 64); | 53 (void) ngx_md5_body(ctx, ctx->buffer, 64); |
53 } | 54 } |
54 | 55 |
55 if (size >= 64) { | 56 if (size >= 64) { |