mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 21:52:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update r->buffered after processing SSI command,

Browse Source 
the bug has been probably introduced in r2378
This commit is contained in:
Igor Sysoev 2010-07-07 10:17:19 +00:00
parent a2e846242f
commit 7aa1f5bf4a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,8 @@ typedef enum {
static ngx_int_t ngx_http_ssi_output(ngx_http_request_t *r, static ngx_int_t ngx_http_ssi_output(ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx); ngx_http_ssi_ctx_t *ctx);
static void ngx_http_ssi_buffered(ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx);
static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r, static ngx_int_t ngx_http_ssi_parse(ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx); ngx_http_ssi_ctx_t *ctx);
static ngx_str_t *ngx_http_ssi_get_variable(ngx_http_request_t *r, static ngx_str_t *ngx_http_ssi_get_variable(ngx_http_request_t *r,
@ -793,6 +795,7 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
} }
if (rc == NGX_DONE || rc == NGX_AGAIN || rc == NGX_ERROR) { if (rc == NGX_DONE || rc == NGX_AGAIN || rc == NGX_ERROR) {
ngx_http_ssi_buffered(r, ctx);
return rc; return rc;
} }
} }
@ -945,14 +948,21 @@ ngx_http_ssi_output(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx)
} }
} }
ngx_http_ssi_buffered(r, ctx);
return rc;
}
static void
ngx_http_ssi_buffered(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx)
{
if (ctx->in || ctx->buf) { if (ctx->in || ctx->buf) {
r->buffered |= NGX_HTTP_SSI_BUFFERED; r->buffered |= NGX_HTTP_SSI_BUFFERED;
} else { } else {
r->buffered &= ~NGX_HTTP_SSI_BUFFERED; r->buffered &= ~NGX_HTTP_SSI_BUFFERED;
} }
return rc;
} }