IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-01-08 07:03:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix segfault when a large FastCGI response was written to a temporary file

Browse Source
This commit is contained in:
Igor Sysoev 2007-02-09 14:02:42 +00:00
parent f15b839a88
commit 915ef4f7c8
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/event/ngx_event_pipe.c
View File

@ -419,6 +419,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
static ngx_int_t static ngx_int_t
ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p) ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
{ {
u_char *prev;
size_t bsize; size_t bsize;
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;
@ -497,11 +498,17 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
/* bsize is the size of the busy recycled bufs */ /* bsize is the size of the busy recycled bufs */
prev = NULL;
bsize = 0; bsize = 0;
for (cl = p->busy; cl; cl = cl->next) { for (cl = p->busy; cl; cl = cl->next) {
if (prev == cl->buf->start) {
continue;
}
if (cl->buf->recycled) { if (cl->buf->recycled) {
bsize += cl->buf->end - cl->buf->start; bsize += cl->buf->end - cl->buf->start;
prev = cl->buf->start;
} }
} }
@ -509,8 +516,14 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
"pipe write busy: %uz", bsize); "pipe write busy: %uz", bsize);
out = NULL; out = NULL;
ll = NULL;
if (bsize >= (size_t) p->busy_size) {
flush = 1;
goto flush;
}
flush = 0; flush = 0;
ll = NULL;
prev_last_shadow = 1; prev_last_shadow = 1;
for ( ;; ) { for ( ;; ) {
@ -579,6 +592,8 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
ll = &cl->next; ll = &cl->next;
} }
flush:
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, p->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, p->log, 0,
"pipe write: out:%p, f:%d", out, flush); "pipe write: out:%p, f:%d", out, flush);