diff options
author | Igor Sysoev <igor@sysoev.ru> | 2007-12-13 00:01:43 +0300 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-13 00:01:43 +0300 |
commit | 6dfe7ca5bdca37f70cbdfd625b0cb82eef2984aa (patch) | |
tree | 7063ce1c45e33787eadf3d9fdbc83f749141d37f /src/http/modules | |
parent | 8cde793350eae89843fa5cfe44a2f4797b9989e9 (diff) |
r1627 merge:
fix gzip and SSL
Diffstat (limited to 'src/http/modules')
-rw-r--r-- | src/http/modules/ngx_http_gzip_filter_module.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c index cb5397ad2..42dfa5021 100644 --- a/src/http/modules/ngx_http_gzip_filter_module.c +++ b/src/http/modules/ngx_http_gzip_filter_module.c @@ -837,12 +837,15 @@ ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in) } } - 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); |