From: Maxim Dounin <mdounin@mdounin.ru>
Date: Sun, 10 Feb 2013 03:52:26 +0000 (+0000)
Subject: Merge of r4966: gzip: fixed zlib memLevel adjusting.
X-Git-Tag: release-1.2.7~21
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=ad72db49c01a9b7bfa16199c7e4760000286790d;p=nginx.git

Merge of r4966: gzip: fixed zlib memLevel adjusting.

An incorrect memLevel (lower than 1) might be passed to deflateInit2() if the
"gzip_hash" directive is set to a value less than the value of "gzip_window"
directive. This resulted in "deflateInit2() failed: -2" alert and an empty
reply.
---

diff --git a/src/http/modules/ngx_http_gzip_filter_module.c b/src/http/modules/ngx_http_gzip_filter_module.c
index 128d3d9c8..964f4fd27 100644
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -497,6 +497,10 @@ ngx_http_gzip_filter_memory(ngx_http_request_t *r, ngx_http_gzip_ctx_t *ctx)
             wbits--;
             memlevel--;
         }
+
+        if (memlevel < 1) {
+            memlevel = 1;
+        }
     }
 
     ctx->wbits = wbits;