summaryrefslogtreecommitdiffhomepage
path: root/src/http/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/http/modules')
-rw-r--r--src/http/modules/ngx_http_gzip_filter.c156
1 files changed, 96 insertions, 60 deletions
diff --git a/src/http/modules/ngx_http_gzip_filter.c b/src/http/modules/ngx_http_gzip_filter.c
index a4b154b74..3b228c47b 100644
--- a/src/http/modules/ngx_http_gzip_filter.c
+++ b/src/http/modules/ngx_http_gzip_filter.c
@@ -495,6 +495,9 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
&& ctx->flush == Z_NO_FLUSH
&& !ctx->redo) {
+ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+ "gzip in: " PTR_FMT, ctx->in);
+
if (ctx->in == NULL) {
break;
}
@@ -505,6 +508,18 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
ctx->zstream.next_in = ctx->in_hunk->pos;
ctx->zstream.avail_in = ctx->in_hunk->last - ctx->in_hunk->pos;
+ ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+ "gzip in_hunk:" PTR_FMT " ni:" PTR_FMT " ai:%d",
+ ctx->in_hunk,
+ ctx->zstream.next_in, ctx->zstream.avail_in);
+
+ /* STUB */
+ if (ctx->in_hunk->last < ctx->in_hunk->pos) {
+ ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+ "zstream.avail_in is huge");
+ return NGX_ERROR;
+ }
+
if (ctx->in_hunk->type & NGX_HUNK_LAST) {
ctx->flush = Z_FINISH;
@@ -547,11 +562,11 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
ctx->zstream.avail_out = conf->bufs.size;
}
- ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
- "deflate in: ni:%X no:%X ai:%d ao:%d fl:%d",
+ ngx_log_debug6(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+ "deflate in: ni:%X no:%X ai:%d ao:%d fl:%d redo:%d",
ctx->zstream.next_in, ctx->zstream.next_out,
ctx->zstream.avail_in, ctx->zstream.avail_out,
- ctx->flush);
+ ctx->flush, ctx->redo);
rc = deflate(&ctx->zstream, ctx->flush);
if (rc != Z_OK && rc != Z_STREAM_END) {
@@ -566,6 +581,10 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
ctx->zstream.avail_in, ctx->zstream.avail_out,
rc);
+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+ "gzip in_hunk:" PTR_FMT " pos:" PTR_FMT,
+ ctx->in_hunk, ctx->in_hunk->pos);
+
ctx->in_hunk->pos = ctx->zstream.next_in;
ctx->out_hunk->last = ctx->zstream.next_out;
@@ -576,95 +595,112 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
ctx->last_out = &cl->next;
ctx->redo = 1;
- } else {
- ctx->redo = 0;
+ continue;
+ }
- if (ctx->flush == Z_SYNC_FLUSH) {
- ctx->out_hunk->type |= NGX_HUNK_FLUSH;
- ctx->flush = Z_NO_FLUSH;
+ ctx->redo = 0;
- ngx_alloc_link_and_set_hunk(cl, ctx->out_hunk, r->pool,
- ngx_http_gzip_error(ctx));
- *ctx->last_out = cl;
- ctx->last_out = &cl->next;
+ if (ctx->flush == Z_SYNC_FLUSH) {
+ ctx->out_hunk->type |= NGX_HUNK_FLUSH;
+ ctx->flush = Z_NO_FLUSH;
- break;
+ ngx_alloc_link_and_set_hunk(cl, ctx->out_hunk, r->pool,
+ ngx_http_gzip_error(ctx));
+ *ctx->last_out = cl;
+ ctx->last_out = &cl->next;
- } else if (ctx->flush == Z_FINISH) {
+ break;
+ }
- /* rc == Z_STREAM_END */
+ if (ctx->flush == Z_FINISH) {
- ctx->zin = ctx->zstream.total_in;
- ctx->zout = 10 + ctx->zstream.total_out + 8;
+ /* rc == Z_STREAM_END */
- rc = deflateEnd(&ctx->zstream);
- if (rc != Z_OK) {
- ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
- "deflateEnd() failed: %d", rc);
- return ngx_http_gzip_error(ctx);
- }
+ ctx->zin = ctx->zstream.total_in;
+ ctx->zout = 10 + ctx->zstream.total_out + 8;
- ngx_pfree(r->pool, ctx->preallocated);
+ rc = deflateEnd(&ctx->zstream);
+ if (rc != Z_OK) {
+ ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
+ "deflateEnd() failed: %d", rc);
+ return ngx_http_gzip_error(ctx);
+ }
- ctx->flush = Z_NO_FLUSH;
+ ngx_pfree(r->pool, ctx->preallocated);
- ngx_alloc_link_and_set_hunk(cl, ctx->out_hunk, r->pool,
- ngx_http_gzip_error(ctx));
- *ctx->last_out = cl;
- ctx->last_out = &cl->next;
+ ctx->flush = Z_NO_FLUSH;
- if (ctx->zstream.avail_out >= 8) {
- trailer = (struct gztrailer *) ctx->out_hunk->last;
- ctx->out_hunk->type |= NGX_HUNK_LAST;
- ctx->out_hunk->last += 8;
+ ngx_alloc_link_and_set_hunk(cl, ctx->out_hunk, r->pool,
+ ngx_http_gzip_error(ctx));
+ *ctx->last_out = cl;
+ ctx->last_out = &cl->next;
- } else {
- ngx_test_null(h,
- ngx_create_temp_hunk(r->pool, 8),
- ngx_http_gzip_error(ctx));
+ if (ctx->zstream.avail_out >= 8) {
+ trailer = (struct gztrailer *) ctx->out_hunk->last;
+ ctx->out_hunk->type |= NGX_HUNK_LAST;
+ ctx->out_hunk->last += 8;
- h->type |= NGX_HUNK_LAST;
+ } else {
+ ngx_test_null(h, ngx_create_temp_hunk(r->pool, 8),
+ ngx_http_gzip_error(ctx));
- ngx_alloc_link_and_set_hunk(cl, h, r->pool,
- ngx_http_gzip_error(ctx));
- *ctx->last_out = cl;
- ctx->last_out = &cl->next;
- trailer = (struct gztrailer *) h->pos;
- h->last += 8;
- }
+ h->type |= NGX_HUNK_LAST;
+
+ ngx_alloc_link_and_set_hunk(cl, h, r->pool,
+ ngx_http_gzip_error(ctx));
+ *ctx->last_out = cl;
+ ctx->last_out = &cl->next;
+ trailer = (struct gztrailer *) h->pos;
+ h->last += 8;
+ }
#if (HAVE_LITTLE_ENDIAN)
- trailer->crc32 = ctx->crc32;
- trailer->zlen = ctx->zin;
+ trailer->crc32 = ctx->crc32;
+ trailer->zlen = ctx->zin;
#else
- /* STUB */ Oops !
+ /* STUB */ Oops !
#endif
- ctx->zstream.avail_in = 0;
- ctx->zstream.avail_out = 0;
+ ctx->zstream.avail_in = 0;
+ ctx->zstream.avail_out = 0;
- ctx->done = 1;
+ ctx->done = 1;
#if 0
- ngx_http_delete_ctx(r, ngx_http_gzip_filter_module);
+ ngx_http_delete_ctx(r, ngx_http_gzip_filter_module);
#endif
- break;
+ break;
+ }
- } else if (conf->no_buffer && ctx->in == NULL) {
- ngx_alloc_link_and_set_hunk(cl, ctx->out_hunk, r->pool,
- ngx_http_gzip_error(ctx));
- *ctx->last_out = cl;
- ctx->last_out = &cl->next;
+ if (conf->no_buffer && ctx->in == NULL) {
+ ngx_alloc_link_and_set_hunk(cl, ctx->out_hunk, r->pool,
+ ngx_http_gzip_error(ctx));
+ *ctx->last_out = cl;
+ ctx->last_out = &cl->next;
- break;
- }
+ break;
}
}
+ if (ctx->out) {
+ if (last == NGX_AGAIN) {
+ return last;
+ }
+
+ } else {
+ if (last == NGX_NONE) {
+ return NGX_OK;
+ }
+
+ return last;
+ }
+
+#if 0
if (ctx->out == NULL && last != NGX_NONE) {
return last;
}
+#endif
last = ngx_http_next_body_filter(r, ctx->out);
generated by cgit (git 2.34.1) at 2026-01-05 20:18:05 +0000