r1627 merge:

fix gzip and SSL
This commit is contained in:
Igor Sysoev 2007-12-12 21:01:43 +00:00
parent dc291bf4f6
commit 97cc2c55fe
1 changed files with 8 additions and 5 deletions

View File

@ -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);