Mercurial > hg > nginx
changeset 1729:ee6d9d2780b6 stable-0.5
r1627 merge:
fix gzip and SSL
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 12 Dec 2007 21:01:43 +0000 |
parents | 412742b3e60e |
children | d1b075a0f7a2 |
files | src/http/modules/ngx_http_gzip_filter_module.c |
diffstat | 1 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_gzip_filter_module.c Wed Dec 12 20:59:58 2007 +0000 +++ b/src/http/modules/ngx_http_gzip_filter_module.c Wed Dec 12 21:01:43 2007 +0000 @@ -837,12 +837,15 @@ } } - if (last == NGX_AGAIN && !ctx->done) { - return NGX_AGAIN; - } + if (ctx->out == NULL) { - if (ctx->out == NULL && ctx->busy == NULL) { - return NGX_OK; + if (last == NGX_AGAIN) { + return NGX_AGAIN; + } + + if (ctx->busy == NULL) { + return NGX_OK; + } } last = ngx_http_next_body_filter(r, ctx->out);