nginx: src/http/modules/ngx_http_gzip_filter

do not pass gzheader separately as due to the previous commit we do not use ctx->busy as flush condition

comparison

equal deleted inserted replaced

-:baa61933d5ed
+:c28e47fb834c
 ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 {
 int                    rc, wbits, memlevel;
 struct gztrailer      *trailer;
 ngx_buf_t             *b;
-ngx_chain_t           *cl, out;
+ngx_chain_t           *cl;
 ngx_http_gzip_ctx_t   *ctx;
 ngx_http_gzip_conf_t  *conf;
 ctx = ngx_http_get_module_ctx(r, ngx_http_gzip_filter_module);
 b->memory = 1;
 b->pos = gzheader;
 b->last = b->pos + 10;
-out.buf = b;
+cl = ngx_alloc_chain_link(r->pool);
-out.next = NULL;
+if (cl == NULL) {
-/*
-* We pass the gzheader to the next filter now to avoid its linking
-* to the ctx->busy chain.  zlib does not usually output the compressed
-* data in the initial iterations, so the gzheader that was linked
-* to the ctx->busy chain would be flushed by ngx_http_write_filter().
-*/
-if (ngx_http_next_body_filter(r, &out) == NGX_ERROR) {
 ngx_http_gzip_error(ctx);
 return NGX_ERROR;
 }
+cl->buf = b;
+cl->next = NULL;
+ctx->out = cl;
+ctx->last_out = &cl->next;
 r->connection->buffered |= NGX_HTTP_GZIP_BUFFERED;
-ctx->last_out = &ctx->out;
 ctx->crc32 = crc32(0L, Z_NULL, 0);
 ctx->flush = Z_NO_FLUSH;
 }

Mercurial > hg > nginx