Mercurial > hg > nginx

changeset 5961:7554c83287dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed sendfile() trailers on OS X (8e903522c17a, 1.7.8). The trailer.count variable was not initialized if there was a header, resulting in "sendfile() failed (22: Invalid argument)" alerts on OS X if the "sendfile" directive was used. The bug was introduced in 8e903522c17a (1.7.8).
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 13 Jan 2015 18:58:23 +0300
parents e9effef98874
children 727177743c3c
files src/os/unix/ngx_darwin_sendfile_chain.c
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/unix/ngx_darwin_sendfile_chain.c
+++ b/src/os/unix/ngx_darwin_sendfile_chain.c
@@ -111,6 +111,9 @@ ngx_darwin_sendfile_chain(ngx_connection
                 }
 
                 send += trailer.size;
+
+            } else {
+                trailer.count = 0;
             }
 
             /*