mirror of
https://github.com/nginx/nginx.git
synced 2025-07-31 10:36:14 +08:00
r2067 merge:
fix bug when inactive subrequest is truncated, if output_buffers are less than subrequest size
This commit is contained in:
parent
4012d9909c
commit
5bba35d25b
@ -168,7 +168,7 @@ ngx_http_postpone_filter_output_postponed_request(ngx_http_request_t *r)
|
|||||||
pr = r->postponed;
|
pr = r->postponed;
|
||||||
|
|
||||||
if (pr == NULL) {
|
if (pr == NULL) {
|
||||||
return NGX_OK;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pr->request) {
|
if (pr->request) {
|
||||||
@ -196,7 +196,7 @@ ngx_http_postpone_filter_output_postponed_request(ngx_http_request_t *r)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (pr == NULL) {
|
if (pr == NULL) {
|
||||||
return NGX_OK;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
out = pr->out;
|
out = pr->out;
|
||||||
@ -215,6 +215,17 @@ ngx_http_postpone_filter_output_postponed_request(ngx_http_request_t *r)
|
|||||||
|
|
||||||
r->postponed = r->postponed->next;
|
r->postponed = r->postponed->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (r->out) {
|
||||||
|
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
|
||||||
|
"http postpone filter out again \"%V?%V\"",
|
||||||
|
&r->uri, &r->args);
|
||||||
|
|
||||||
|
r->connection->data = r;
|
||||||
|
return NGX_AGAIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NGX_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user