diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-23 06:01:52 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-23 06:01:52 +0000 |
| commit | 89690bfe02703853c3e987d1e5c4d9878c4d28f0 (patch) | |
| tree | c5d9a59cdd74b54ffa939dcf59886307f26c984c /src/event/ngx_event_pipe.c | |
| parent | ae02c19867083c6ad3e51506109cb37bca1d36d1 (diff) | |
| download | nginx-89690bfe02703853c3e987d1e5c4d9878c4d28f0.tar.gz nginx-89690bfe02703853c3e987d1e5c4d9878c4d28f0.tar.bz2 | |
nginx-0.0.3-2004-03-23-09:01:52 import
Diffstat (limited to 'src/event/ngx_event_pipe.c')
| -rw-r--r-- | src/event/ngx_event_pipe.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c index b7cb6b6ae..f2545171a 100644 --- a/src/event/ngx_event_pipe.c +++ b/src/event/ngx_event_pipe.c @@ -377,12 +377,16 @@ int ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p) bsize = 0; to_write = 0; +#if 0 if (!(p->upstream_eof || p->upstream_error || p->upstream_done)) { +#endif for (cl = p->busy; cl; cl = cl->next) { bsize += cl->hunk->end - cl->hunk->start; to_write += ngx_hunk_size(cl->hunk); } +#if 0 } +#endif out = NULL; ll = NULL; @@ -391,11 +395,17 @@ int ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p) if (p->out) { cl = p->out; +#if 0 if (!(p->upstream_eof || p->upstream_error || p->upstream_done) && (bsize + ngx_hunk_size(cl->hunk) > p->busy_size)) { break; } +#else + if (bsize + ngx_hunk_size(cl->hunk) > p->busy_size) { + break; + } +#endif p->out = p->out->next; ngx_event_pipe_free_shadow_raw_hunk(&p->free_raw_hunks, @@ -404,11 +414,17 @@ int ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p) } else if (!p->cachable && p->in) { cl = p->in; +#if 0 if (!(p->upstream_eof || p->upstream_error || p->upstream_done) && (bsize + ngx_hunk_size(cl->hunk) > p->busy_size)) { break; } +#else + if (bsize + ngx_hunk_size(cl->hunk) > p->busy_size) { + break; + } +#endif p->in = p->in->next; |