summaryrefslogtreecommitdiff
path: root/src/os/unix/ngx_freebsd_sendfile_chain.c
diff options
context:
space:
mode:
authornginx <nginx@nginx.org>2015-04-07 15:42:39 +0000
committerJon Kolb <kolbyjack@gmail.com>2015-04-07 15:42:39 +0000
commit6612579e5a1459b05960a31bbbcfe4cd5afc319a (patch)
tree6959ffbbb370e1aa938c169dec4e226c160c9d44 /src/os/unix/ngx_freebsd_sendfile_chain.c
parentae88e2338f6e27459ace8a23754afc5892c2c5be (diff)
downloadnginx-1.7.tar.gz
Changes with nginx 1.7.12 07 Apr 2015v1.7.12nginx-1.7
*) Feature: now the "tcp_nodelay" directive works with backend SSL connections. *) Feature: now thread pools can be used to read cache file headers. *) Bugfix: in the "proxy_request_buffering" directive. *) Bugfix: a segmentation fault might occur in a worker process when using thread pools on Linux. *) Bugfix: in error handling when using the "ssl_stapling" directive. Thanks to Filipe da Silva. *) Bugfix: in the ngx_http_spdy_module.
Diffstat (limited to 'src/os/unix/ngx_freebsd_sendfile_chain.c')
-rw-r--r--src/os/unix/ngx_freebsd_sendfile_chain.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index 25790b6b6..3f17dc6e4 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -266,9 +266,9 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
c->busy_count = 0;
}
- rc = aio->preload_handler(file);
+ n = aio->preload_handler(file);
- if (rc > 0) {
+ if (n > 0) {
send = prev_send + sent;
continue;
}