mirror of
https://github.com/nginx/nginx.git
synced 2025-06-07 17:52:38 +08:00
fix FastCGI "zero size buf" alert,
the previous commit did not fix too
This commit is contained in:
parent
aafa2004d7
commit
97c0d35037
@ -518,19 +518,12 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
|
|||||||
cl = p->out;
|
cl = p->out;
|
||||||
|
|
||||||
if (cl->buf->recycled
|
if (cl->buf->recycled
|
||||||
&& cl->buf->last_shadow
|
|
||||||
&& bsize + cl->buf->last - cl->buf->pos > p->busy_size)
|
&& bsize + cl->buf->last - cl->buf->pos > p->busy_size)
|
||||||
{
|
{
|
||||||
if (!prev_last_shadow) {
|
|
||||||
p->in = p->in->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
flush = 1;
|
flush = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
prev_last_shadow = cl->buf->last_shadow;
|
|
||||||
|
|
||||||
p->out = p->out->next;
|
p->out = p->out->next;
|
||||||
|
|
||||||
ngx_event_pipe_free_shadow_raw_buf(&p->free_raw_bufs, cl->buf);
|
ngx_event_pipe_free_shadow_raw_buf(&p->free_raw_bufs, cl->buf);
|
||||||
@ -550,6 +543,15 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
|
|||||||
{
|
{
|
||||||
if (!prev_last_shadow) {
|
if (!prev_last_shadow) {
|
||||||
p->in = p->in->next;
|
p->in = p->in->next;
|
||||||
|
|
||||||
|
cl->next = NULL;
|
||||||
|
|
||||||
|
if (out) {
|
||||||
|
*ll = cl;
|
||||||
|
} else {
|
||||||
|
out = cl;
|
||||||
|
}
|
||||||
|
ll = &cl->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
flush = 1;
|
flush = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user