diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 15:07:03 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-10-11 15:07:03 +0000 |
| commit | 924bd79e317e9a137c0d1b9d349185758a628ec4 (patch) | |
| tree | f877c8b19e53e7d0a7683e3dd9aeb713146c4a8f /src/core/ngx_output_chain.c | |
| parent | aef13d7f6660f4f8d2c50c95b8e182e62c115f88 (diff) | |
| download | nginx-924bd79e317e9a137c0d1b9d349185758a628ec4.tar.gz nginx-924bd79e317e9a137c0d1b9d349185758a628ec4.zip | |
nginx-0.1.1-RELEASE importrelease-0.1.1
*) Feature: the gzip_types directive.
*) Feature: the tcp_nodelay directive.
*) Feature: the send_lowat directive is working not only on OSes that
support kqueue NOTE_LOWAT, but also on OSes that support SO_SNDLOWAT.
*) Feature: the setproctitle() emulation for Linux and Solaris.
*) Bugfix: the "Location" header rewrite bug fixed while the proxying.
*) Bugfix: the ngx_http_chunked_module module may get caught in an
endless loop.
*) Bugfix: the /dev/poll module bugs fixed.
*) Bugfix: the responses were corrupted when the temporary files were
used while the proxying.
*) Bugfix: the unescaped requests were passed to the backend.
*) Bugfix: while the build configuration on Linux 2.4 the
--with-poll_module parameter was required.
Diffstat (limited to 'src/core/ngx_output_chain.c')
| -rw-r--r-- | src/core/ngx_output_chain.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c index f0d66cb93..74e38e184 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -228,8 +228,15 @@ static ngx_int_t ngx_output_chain_copy_buf(ngx_buf_t *dst, ngx_buf_t *src, src->pos += size; dst->last += size; - if (src->in_file) { + if (src->in_file && sendfile) { + dst->in_file = 1; + dst->file = src->file; + dst->file_pos = src->file_pos; src->file_pos += size; + dst->file_last = src->file_pos; + + } else { + dst->in_file = 0; } if (src->last_buf && src->pos == src->last) { @@ -258,11 +265,18 @@ static ngx_int_t ngx_output_chain_copy_buf(ngx_buf_t *dst, ngx_buf_t *src, } } - src->file_pos += n; dst->last += n; - if (!sendfile) { + if (sendfile) { + dst->in_file = 1; + dst->file = src->file; + dst->file_pos = src->file_pos; + src->file_pos += size; + dst->file_last = src->file_pos; + + } else { dst->in_file = 0; + src->file_pos += n; } if (src->last_buf && src->file_pos == src->file_last) { |