Mercurial > hg > nginx

diff src/core/ngx_output_chain.c @ 452:23fb87bddda1 release-0.1.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.1.1-RELEASE import *) 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.
author Igor Sysoev <igor@sysoev.ru>
date Mon, 11 Oct 2004 15:07:03 +0000
parents 42d11f017717
children 295d97d70c69
line wrap: on
line diff
--- 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_b
         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_b
             }
         }
 
-        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) {