Mercurial > hg > nginx
changeset 3283:52b1624b93c2
fix segfault in SSL if limit_rate is used
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 03 Nov 2009 15:38:33 +0000 |
parents | c76b7a7959d5 |
children | c025e3525144 |
files | src/event/ngx_event_openssl.c |
diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_openssl.c Tue Nov 03 15:05:38 2009 +0000 +++ b/src/event/ngx_event_openssl.c Tue Nov 03 15:38:33 2009 +0000 @@ -946,7 +946,7 @@ for ( ;; ) { - while (in && buf->last < buf->end) { + while (in && buf->last < buf->end && send < limit) { if (in->buf->last_buf || in->buf->flush) { flush = 1; } @@ -973,8 +973,8 @@ ngx_memcpy(buf->last, in->buf->pos, size); buf->last += size; - in->buf->pos += size; + send += size; if (in->buf->pos == in->buf->last) { in = in->next; @@ -999,7 +999,6 @@ } buf->pos += n; - send += n; c->sent += n; if (n < size) {