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

r1626 merge: 

fix segfaults
This commit is contained in:
Igor Sysoev 2007-12-12 20:59:58 +00:00
parent e301eca9b5
commit dc291bf4f6
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/event/ngx_event_pipe.c
View File

@ -421,6 +421,7 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
{
u_char *prev;
size_t bsize;
ngx_int_t rc;
ngx_uint_t flush, prev_last_shadow;
ngx_chain_t *out, **ll, *cl;
ngx_connection_t *downstream;
@ -451,7 +452,13 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
cl->buf->recycled = 0;
}
if (p->output_filter(p->output_ctx, p->out) == NGX_ERROR) {
rc = p->output_filter(p->output_ctx, p->out);
if (downstream->destroyed) {
return NGX_ABORT;
}
if (rc == NGX_ERROR) {
p->downstream_error = 1;
return ngx_event_pipe_drain_chains(p);
}
@ -467,12 +474,13 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
cl->buf->recycled = 0;
}
if (p->output_filter(p->output_ctx, p->in) == NGX_ERROR) {
rc = p->output_filter(p->output_ctx, p->in);
if (downstream->destroyed) {
return NGX_ABORT;
}
if (downstream->destroyed) {
return NGX_ABORT;
}
if (rc == NGX_ERROR) {
p->downstream_error = 1;
return ngx_event_pipe_drain_chains(p);
}
@ -602,7 +610,13 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
break;
}
if (p->output_filter(p->output_ctx, out) == NGX_ERROR) {
rc = p->output_filter(p->output_ctx, out);
if (downstream->destroyed) {
return NGX_ABORT;
}
if (rc == NGX_ERROR) {
p->downstream_error = 1;
return ngx_event_pipe_drain_chains(p);
}