nginx-0.1.16-RELEASE importrelease-0.1.16

    *) Bugfix: if the response were transferred by chunks, then on the HEAD
       request the final chunk was issued.

    *) Bugfix: the "Connection: keep-alive" header were issued, even if the
       keepalive_timeout directive forbade the keep-alive use.

    *) Bugfix: the errors in the ngx_http_fastcgi_module caused the
       segmentation faults.

    *) Bugfix: the compressed response encrypted by SSL may not transferred
       complete.

    *) Bugfix: the TCP-specific TCP_NODELAY, TCP_NOPSUH, and TCP_CORK
       options, are not used for the unix domain sockets.

    *) Feature: the rewrite directive supports the arguments rewriting.

    *) Bugfix: the response code 400 was returned for the POST request with
       the "Content-Length: 0" header; the bug had appeared in 0.1.14.

4 files changed, 31 insertions, 16 deletions

diff --git a/src/os/unix/ngx_channel.c b/src/os/unix/ngx_channel.c
index 1fd5cb46b..853c5d6fd 100644
--- a/src/os/unix/ngx_channel.c
+++ b/src/os/unix/ngx_channel.c
@@ -38,6 +38,8 @@ ngx_int_t ngx_write_channel(ngx_socket_t s, ngx_channel_t *ch, size_t size,
         *(int *) CMSG_DATA(&cmsg.cm) = ch->fd;
     }
 
+    msg.msg_flags = 0;
+
 #else
 
     if (ch->fd == -1) {
@@ -58,7 +60,6 @@ ngx_int_t ngx_write_channel(ngx_socket_t s, ngx_channel_t *ch, size_t size,
     msg.msg_namelen = 0;
     msg.msg_iov = iov;
     msg.msg_iovlen = 1;
-    msg.msg_flags = 0;
 
     n = sendmsg(s, &msg, 0);
 
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index 0b4dfc0d0..50cad3090 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -279,11 +279,17 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
                 }
             }
 
-            if (rc == 0 && sent == 0) {
+            /*
+             * sendfile() in FreeBSD 3.x-4.x may return value >= 0
+             * on success, although only 0 is documented
+             */
+
+            if (rc >= 0 && sent == 0) {
 
                 /*
-                 * rc and sent equal to zero when someone has truncated
-                 * the file, so the offset became beyond the end of the file
+                 * if rc is OK and sent equal to zero, then someone
+                 * has truncated the file, so the offset became beyond
+                 * the end of the file
                  */
 
                 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c
index 59bc59c76..d45d7c073 100644
--- a/src/os/unix/ngx_linux_sendfile_chain.c
+++ b/src/os/unix/ngx_linux_sendfile_chain.c
@@ -89,7 +89,18 @@ ngx_chain_t *ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
 #if 1
             if (!ngx_buf_in_memory(cl->buf) && !cl->buf->in_file) {
                 ngx_log_error(NGX_LOG_ALERT, c->log, 0,
-                              "zero size buf in sendfile");
+                              "zero size buf in sendfile "
+                              "t:%d r:%d f:%d %p %p-%p %p %O-%O",
+                              cl->buf->temporary,
+                              cl->buf->recycled,
+                              cl->buf->in_file,
+                              cl->buf->start,
+                              cl->buf->pos,
+                              cl->buf->last,
+                              cl->buf->file,
+                              cl->buf->file_pos,
+                              cl->buf->file_last);
+
                 ngx_debug_point();
             }
 #endif
@@ -129,7 +140,7 @@ ngx_chain_t *ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
         {
             /* the TCP_CORK and TCP_NODELAY are mutually exclusive */
 
-            if (c->tcp_nodelay) {
+            if (c->tcp_nodelay == NGX_TCP_NODELAY_SET) {
 
                 tcp_nodelay = 0;
 
@@ -146,20 +157,20 @@ ngx_chain_t *ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
 
                     if (err != NGX_EINTR) { 
                         wev->error = 1;
-                        ngx_connection_error(c, ngx_socket_errno,
+                        ngx_connection_error(c, err,
                                              "setsockopt(TCP_NODELAY) failed");
                         return NGX_CHAIN_ERROR;
                     }
 
                 } else {
-                    c->tcp_nodelay = 0;
+                    c->tcp_nodelay = NGX_TCP_NODELAY_UNSET;
 
                     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0,
                                    "no tcp_nodelay");
                 }
             }
 
-            if (!c->tcp_nodelay) {
+            if (c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
 
                 if (ngx_tcp_nopush(c->fd) == NGX_ERROR) {
                     err = ngx_errno;
diff --git a/src/os/unix/rfork_thread.S b/src/os/unix/rfork_thread.S
index 42630a78a..161007d6b 100644
--- a/src/os/unix/rfork_thread.S
+++ b/src/os/unix/rfork_thread.S
@@ -4,7 +4,6 @@
  */
 
 
-
 #include <sys/syscall.h>
 #include <machine/asm.h>
 
@@ -19,14 +18,14 @@ ENTRY(rfork_thread)
 	mov	%esp, %ebp
 	push	%esi
 
-	mov	12(%ebp), %esi	# the stack address
+	mov	12(%ebp), %esi	# the thread stack address
 
 	sub	$4, %esi
 	mov	20(%ebp), %eax	# the thread argument
 	mov	%eax, (%esi)
 
 	sub	$4, %esi
-	mov	16(%ebp), %eax	# the start thread address
+	mov	16(%ebp), %eax	# the thread start address
 	mov	%eax, (%esi)
 
 	push	8(%ebp)		# rfork(2) flags
@@ -41,8 +40,7 @@ ENTRY(rfork_thread)
 parent:
 	add	$8, %esp
 	pop	%esi
-	mov	%ebp, %esp
-	pop	%ebp
+	leave
 	ret
 
 child:
@@ -59,8 +57,7 @@ child:
 error:
 	add	$8, %esp
 	pop	%esi
-	mov	%ebp, %esp
-	pop	%ebp
+	leave
 	PIC_PROLOGUE
 
 	/* libc's cerror: jmp  PIC_PLT(HIDENAME(cerror)) */