Author: vbart
Date: 2013-03-11 11:19:58 +0000 (Mon, 11 Mar 2013)
New Revision: 5108
URL: http://trac.nginx.org/nginx/changeset/5108/nginx
Log:
Gzip: fixed setting of NGX_HTTP_GZIP_BUFFERED.
In r2411 setting of NGX_HTTP_GZIP_BUFFERED in c->buffered was moved from
ngx_http_gzip_filter_deflate_start() to ngx_http_gzip_filter_buffer() since
it was always called first. But in r2543 the "postpone_gzipping" directive
was introduced, and if postponed gzipping is disabled (the default setting),
ngx_http_gzip_filter_buffer() is not called at all.
We must always set NGX_HTTP_GZIP_BUFFERED after the start of compression
since there is always a trailer that is buffered.
There are no known cases when it leads to any problem with current code.
But we already had troubles in upcoming SPDY implementation.
Modified:
trunk/src/http/modules/ngx_http_gzip_filter_module.c
Modified: trunk/src/http/modules/ngx_http_gzip_filter_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_gzip_filter_module.c 2013-03-07 18:21:28 UTC (rev 5107)
+++ trunk/src/http/modules/ngx_http_gzip_filter_module.c 2013-03-11 11:19:58 UTC (rev 5108)
@@ -620,6 +620,8 @@
return NGX_ERROR;
}
+ r->connection->buffered |= NGX_HTTP_GZIP_BUFFERED;
+
ctx->last_out = &ctx->out;
ctx->crc32 = crc32(0L, Z_NULL, 0);
ctx->flush = Z_NO_FLUSH;