mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-20 19:27:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 4f519a66f3 into c52c5698cd

Browse Source
This commit is contained in:
Aaron Jensen 2025-07-16 20:08:35 +02:00 committed by GitHub
commit b5464034c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/http/modules/ngx_http_ssi_filter_module.c
View File

@ -325,6 +325,39 @@ static ngx_http_variable_t ngx_http_ssi_vars[] = {
};
static ngx_http_ssi_ctx_t *
ngx_http_ssi_create_ctx(ngx_http_request_t *r)
{
ngx_http_ssi_ctx_t *ctx;
ngx_http_ssi_loc_conf_t *slcf;
ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_ssi_ctx_t));
if (ctx == NULL) {
return NULL;
}
ngx_http_set_ctx(r, ctx, ngx_http_ssi_filter_module);
slcf = ngx_http_get_module_loc_conf(r, ngx_http_ssi_filter_module);
ctx->value_len = slcf->value_len;
ctx->last_out = &ctx->out;
ctx->encoding = NGX_HTTP_SSI_ENTITY_ENCODING;
ctx->output = 1;
ctx->params.elts = ctx->params_array;
ctx->params.size = sizeof(ngx_table_elt_t);
ctx->params.nalloc = NGX_HTTP_SSI_PARAMS_N;
ctx->params.pool = r->pool;
ctx->timefmt = ngx_http_ssi_timefmt;
ngx_str_set(&ctx->errmsg,
"[an error occurred while processing the directive]");
return ctx;
}
static ngx_int_t
ngx_http_ssi_header_filter(ngx_http_request_t *r)
@ -343,29 +376,11 @@ ngx_http_ssi_header_filter(ngx_http_request_t *r)
mctx = ngx_http_get_module_ctx(r->main, ngx_http_ssi_filter_module);
ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_ssi_ctx_t));
ctx = ngx_http_ssi_create_ctx(r);
if (ctx == NULL) {
return NGX_ERROR;
}
ngx_http_set_ctx(r, ctx, ngx_http_ssi_filter_module);
ctx->value_len = slcf->value_len;
ctx->last_out = &ctx->out;
ctx->encoding = NGX_HTTP_SSI_ENTITY_ENCODING;
ctx->output = 1;
ctx->params.elts = ctx->params_array;
ctx->params.size = sizeof(ngx_table_elt_t);
ctx->params.nalloc = NGX_HTTP_SSI_PARAMS_N;
ctx->params.pool = r->pool;
ctx->timefmt = ngx_http_ssi_timefmt;
ngx_str_set(&ctx->errmsg,
"[an error occurred while processing the directive]");
r->filter_need_in_memory = 1;
if (r == r->main) {
@ -2232,12 +2247,28 @@ ngx_http_ssi_include(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
static ngx_int_t
ngx_http_ssi_stub_output(ngx_http_request_t *r, void *data, ngx_int_t rc)
{
ngx_chain_t *out;
ngx_chain_t *out;
ngx_http_ssi_ctx_t *ctx;
if (rc == NGX_ERROR || r->connection->error || r->request_output) {
return rc;
}
ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module);
if (ctx && ctx->stub_output_done) {
return NGX_OK;
}
if (ctx == NULL) {
ctx = ngx_http_ssi_create_ctx(r);
if (ctx == NULL) {
return NGX_ERROR;
}
}
ctx->stub_output_done = 1;
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"ssi stub output: \"%V?%V\"", &r->uri, &r->args);

2
src/http/modules/ngx_http_ssi_filter_module.h
View File

@ -82,6 +82,8 @@ typedef struct {
void *value_buf;
ngx_str_t timefmt;
ngx_str_t errmsg;
ngx_uint_t stub_output_done;
} ngx_http_ssi_ctx_t;