summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorYichun Zhang <agentzh@gmail.com>2013-10-28 15:01:36 -0700
committerYichun Zhang <agentzh@gmail.com>2013-10-28 15:01:36 -0700
commit3d3fa2adc6461941219f5e49935a0f1e6e4ea393 (patch)
tree3eb0244c664e23cfa97c059260fc21a410530bed /src
parent0eee3b0bc5ff2d62d38488bae1e67172c868d0f7 (diff)
downloadnginx-3d3fa2adc6461941219f5e49935a0f1e6e4ea393.tar.gz
nginx-3d3fa2adc6461941219f5e49935a0f1e6e4ea393.tar.bz2
Gzip, gunzip: flush pending data when incoming chain is NULL.
Diffstat (limited to 'src')
-rw-r--r--src/http/modules/ngx_http_gunzip_filter_module.c2
-rw-r--r--src/http/modules/ngx_http_gzip_filter_module.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_gunzip_filter_module.c b/src/http/modules/ngx_http_gunzip_filter_module.c
index d4e41e4a0..c2d504e0d 100644
--- a/src/http/modules/ngx_http_gunzip_filter_module.c
+++ b/src/http/modules/ngx_http_gunzip_filter_module.c
@@ -199,7 +199,7 @@ ngx_http_gunzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
}
}
- if (ctx->nomem) {
+ if (ctx->nomem || in == NULL) {
/* flush busy buffers */
diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index 837b0bc98..ea1f1d0b9 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -372,7 +372,7 @@ ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
r->connection->buffered |= NGX_HTTP_GZIP_BUFFERED;
}
- if (ctx->nomem) {
+ if (ctx->nomem || in == NULL) {
/* flush busy buffers */