2013-10-28 22:30:52 +00:00
|
|
|
# HG changeset patch
|
|
|
|
|
# User Yichun Zhang <agentzh@gmail.com>
|
|
|
|
|
# Date 1382997696 25200
|
|
|
|
|
# Branch gzip-flush
|
|
|
|
|
# Node ID 8985d6cc9a4334e954909c130e6204c6fc673d7e
|
|
|
|
|
# Parent e6a1623f87bc96d5ec62b6d77356aa47dbc60756
|
|
|
|
|
Flush pending data when incoming chain is NULL in gzip and gunzip modules
|
|
|
|
|
|
|
|
|
|
diff -r e6a1623f87bc -r 8985d6cc9a43 src/http/modules/ngx_http_gunzip_filter_module.c
|
|
|
|
|
--- a/src/http/modules/ngx_http_gunzip_filter_module.c Mon Oct 21 18:20:32 2013 +0800
|
|
|
|
|
+++ b/src/http/modules/ngx_http_gunzip_filter_module.c Mon Oct 28 15:01:36 2013 -0700
|
|
|
|
|
@@ -199,7 +199,7 @@
|
2013-10-27 00:24:51 +00:00
|
|
|
}
|
|
|
|
|
}
|
2013-10-26 00:31:39 +00:00
|
|
|
|
2013-10-27 00:24:51 +00:00
|
|
|
- if (ctx->nomem) {
|
|
|
|
|
+ if (ctx->nomem || in == NULL) {
|
|
|
|
|
|
|
|
|
|
/* flush busy buffers */
|
|
|
|
|
|
2013-10-28 22:30:52 +00:00
|
|
|
diff -r e6a1623f87bc -r 8985d6cc9a43 src/http/modules/ngx_http_gzip_filter_module.c
|
|
|
|
|
--- a/src/http/modules/ngx_http_gzip_filter_module.c Mon Oct 21 18:20:32 2013 +0800
|
|
|
|
|
+++ b/src/http/modules/ngx_http_gzip_filter_module.c Mon Oct 28 15:01:36 2013 -0700
|
|
|
|
|
@@ -372,7 +372,7 @@
|
|
|
|
|
r->connection->buffered |= NGX_HTTP_GZIP_BUFFERED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (ctx->nomem) {
|
|
|
|
|
+ if (ctx->nomem || in == NULL) {
|
|
|
|
|
|
|
|
|
|
/* flush busy buffers */
|
|
|
|
|
|
