Changeset 95d817

Timestamp:

02/04/08 16:11:29 (4 years ago)

Author:

Tomash Brechko <tomash.brechko@…>

Branches:

master-v0.7, gunzip, master-v0.6, memcached_gzip, upstream_count_limit

Children:

88f48a, 56389f

Parents:

ec81a7

git-author:

Tomash Brechko <tomash.brechko@…> (02/04/08 16:11:29)

git-committer:

Tomash Brechko <tomash.brechko@…> (02/04/08 16:11:29)

Message:

Do not output empty buffers on decompression.

File:

• server/src/http/modules/ngx_http_gzip_filter_module.c (modified) (1 diff)

server/src/http/modules/ngx_http_gzip_filter_module.c

@@ -626 +626 @@
                 }
 
-                cl->buf = ctx->out_buf;
-                cl->next = NULL;
-                *ctx->last_out = cl;
-                ctx->last_out = &cl->next;
+                /*
+                 * On decompression we could already output everything
+                 * under (ctx->flush == Z_SYNC_FLUSH), so we test here
+                 * that the buffer is not empty.
+                 */
+                if (!r->gunzip || ctx->out_buf->last > ctx->out_buf->pos) {
+                    cl->buf = ctx->out_buf;
+                    cl->next = NULL;
+                    *ctx->last_out = cl;
+                    ctx->last_out = &cl->next;
+                }
 
                 if (!r->gunzip) {