aports/main/nginx/zstd-nginx-module~fix-infinite-loop.patch
2024-03-20 20:32:30 +01:00

47 lines
1.7 KiB
Diff

patch-source: https://github.com/tokers/zstd-nginx-module/pull/23
From 7f86e5bbd7711b216688c418ffe2a64c9b25f319 Mon Sep 17 00:00:00 2001
From: drawing <cppbreak@qq.com>
Date: Mon, 12 Jun 2023 14:37:00 +0800
Subject: [PATCH] bugfix: fix zstd module infinite loop when upstream return
content-length abnormal
---
filter/ngx_http_zstd_filter_module.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/filter/ngx_http_zstd_filter_module.c b/filter/ngx_http_zstd_filter_module.c
index d5784ba..cea386f 100644
--- a/filter/ngx_http_zstd_filter_module.c
+++ b/filter/ngx_http_zstd_filter_module.c
@@ -440,6 +440,8 @@ ngx_http_zstd_filter_compress(ngx_http_request_t *r, ngx_http_zstd_ctx_t *ctx)
ctx->out_buf->last += ctx->buffer_out.pos - pos_out;
ctx->redo = 0;
+ unsigned last_action = ctx->action;
+
if (rc > 0) {
if (ctx->action == NGX_HTTP_ZSTD_FILTER_COMPRESS) {
ctx->action = NGX_HTTP_ZSTD_FILTER_FLUSH;
@@ -459,7 +461,7 @@ ngx_http_zstd_filter_compress(ngx_http_request_t *r, ngx_http_zstd_ctx_t *ctx)
ctx->action = NGX_HTTP_ZSTD_FILTER_COMPRESS; /* restore */
}
- if (ngx_buf_size(ctx->out_buf) == 0) {
+ if (ngx_buf_size(ctx->out_buf) == 0 && last_action != NGX_HTTP_ZSTD_FILTER_FLUSH) {
return NGX_AGAIN;
}
@@ -469,6 +471,12 @@ ngx_http_zstd_filter_compress(ngx_http_request_t *r, ngx_http_zstd_ctx_t *ctx)
}
b = ctx->out_buf;
+ if (ngx_buf_size(b) == 0) {
+ b = ngx_calloc_buf(ctx->request->pool);
+ if (b == NULL) {
+ return NGX_ERROR;
+ }
+ }
if (rc == 0 && (ctx->flush || ctx->last)) {
r->connection->buffered &= ~NGX_HTTP_GZIP_BUFFERED;