IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix segfaults

Browse Source
This commit is contained in:
Igor Sysoev
2007-11-08 15:20:56 +00:00
parent d7cf1a6c1f
commit 408dfc1714
1 changed files with 20 additions and 6 deletions
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; u_char *prev;
size_t bsize; size_t bsize;
ngx_int_t rc;
ngx_uint_t flush, prev_last_shadow; ngx_uint_t flush, prev_last_shadow;
ngx_chain_t *out, **ll, *cl; ngx_chain_t *out, **ll, *cl;
ngx_connection_t *downstream; ngx_connection_t *downstream;
@@ -451,7 +452,13 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
cl->buf->recycled = 0; 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; p->downstream_error = 1;
return ngx_event_pipe_drain_chains(p); 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; 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) { if (downstream->destroyed) {
return NGX_ABORT; return NGX_ABORT;
} }
if (rc == NGX_ERROR) {
p->downstream_error = 1; p->downstream_error = 1;
return ngx_event_pipe_drain_chains(p); return ngx_event_pipe_drain_chains(p);
} }
@@ -602,7 +610,13 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
break; 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; p->downstream_error = 1;
return ngx_event_pipe_drain_chains(p); return ngx_event_pipe_drain_chains(p);
} }