Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r1260 merge: 

if subrequest response was buffered in file, then subrequest was finalized
with 0 code, ngx_http_writer() was not set, and response part in file was lost
This commit is contained in:
Igor Sysoev 2007-07-05 11:42:11 +00:00
parent 61092efcfa
commit 890a7407c7
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/ngx_http_copy_filter_module.c
View File

@ -117,6 +117,10 @@ ngx_http_copy_filter(ngx_http_request_t *r, ngx_chain_t *in)
r->buffered |= NGX_HTTP_COPY_BUFFERED;
}
if (r != r->main) {
r->out = ctx->in;
}
#if (NGX_DEBUG)
ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
"copy filter: %i \"%V?%V\"", rc, &r->uri, &r->args);

13
src/http/ngx_http_upstream.c
View File

@ -2157,8 +2157,17 @@ ngx_http_upstream_finalize_request(ngx_http_request_t *r,
r->connection->log->action = "sending to client";
if (rc == 0 && r == r->main && !r->post_action) {
rc = ngx_http_send_special(r, NGX_HTTP_LAST);
if (rc == 0) {
if (r == r->main) {
if (!r->post_action) {
rc = ngx_http_send_special(r, NGX_HTTP_LAST);
}
} else {
if (r->out) {
rc = NGX_AGAIN;
}
}
}
ngx_http_finalize_request(r, rc);