r1262 merge:

if a subrequest was finished and SSI was in middle of SSI command parsing
and the command was a fast subrequest then the second subrequest output
was just after first subrequest output and response part of main request
between the subrequests went after the second subrequest.
This commit is contained in:
Igor Sysoev 2007-07-05 11:36:16 +00:00
parent f14fcc5d23
commit 61092efcfa
1 changed files with 8 additions and 2 deletions

View File

@ -800,8 +800,14 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
}
}
if (cmd->flush && ctx->out) {
rc = ngx_http_ssi_output(r, ctx);
if (cmd->flush) {
if (ctx->out) {
rc = ngx_http_ssi_output(r, ctx);
} else {
rc = ngx_http_next_body_filter(r, NULL);
}
if (rc == NGX_ERROR) {
return NGX_ERROR;