Skip to content

bugfix: fix zstd module infinite loop when upstream return content-length abnormal #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bugfix: fix zstd module infinite loop when upstream return content-length abnormal #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion filter/ngx_http_zstd_filter_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand All @@ -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;
Expand Down