From 68d1241d125f468ead6dbe8e8c48f7f0b8d7b9e7 Mon Sep 17 00:00:00 2001 From: "Yichun Zhang (agentzh)" Date: Mon, 28 Oct 2013 15:30:52 -0700 Subject: [PATCH] updated the gzip_flush_bug patch to fix the issue in the ngx_gunzip module. thanks Maxim Dounin for the catch. --- patches/nginx-1.4.3-gzip_flush_bug.patch | 27 +++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/patches/nginx-1.4.3-gzip_flush_bug.patch b/patches/nginx-1.4.3-gzip_flush_bug.patch index 0579329..629e544 100644 --- a/patches/nginx-1.4.3-gzip_flush_bug.patch +++ b/patches/nginx-1.4.3-gzip_flush_bug.patch @@ -1,6 +1,15 @@ ---- nginx-1.4.3/src/http/modules/ngx_http_gzip_filter_module.c 2013-10-08 05:07:14.000000000 -0700 -+++ nginx-1.4.3-patched/src/http/modules/ngx_http_gzip_filter_module.c 2013-10-27 14:53:49.723406912 -0700 -@@ -370,7 +370,7 @@ ngx_http_gzip_body_filter(ngx_http_reque +# HG changeset patch +# User Yichun Zhang +# 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 @@ } } @@ -9,3 +18,15 @@ /* flush busy buffers */ +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 */ +