From: Maxim Dounin <mdounin@mdounin.ru>
Date: Tue, 13 Jan 2015 15:58:23 +0000 (+0300)
Subject: Fixed sendfile() trailers on OS X (8e903522c17a, 1.7.8).
X-Git-Tag: release-1.7.10~13
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=2754fd3c803cce0ae7caf1a2ce2ada7e88e60b1b;p=nginx.git

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).
---

diff --git a/src/os/unix/ngx_darwin_sendfile_chain.c b/src/os/unix/ngx_darwin_sendfile_chain.c
index f01651a11..c802e9f9a 100644
--- 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_t *c, ngx_chain_t *in, off_t limit)
                 }
 
                 send += trailer.size;
+
+            } else {
+                trailer.count = 0;
             }
 
             /*