nginx-0.3.24-RELEASE import
*) Workaround: for bug in FreeBSD kqueue.
*) Bugfix: now a response generated by the "post_action" directive is
not transferred to a client.
*) Bugfix: the memory leaks were occurring if many log files were used.
*) Bugfix: the first "proxy_redirect" directive was working inside one
location.
*) Bugfix: on 64-bit platforms segmentation fault may occurred on start
if the many names were used in the "server_name" directives; the bug
had appeared in 0.3.18.
diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index 0d38729..a8a351a 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -70,6 +70,21 @@
}
}
+ if (n == 0) {
+
+ /*
+ * on FreeBSD recv() may return 0 on closed socket
+ * even if kqueue reported about available data
+ */
+
+ ngx_log_error(NGX_LOG_ALERT, c->log, 0,
+ "recv() returned 0 while keevnt() reported "
+ "%d available bytes", rev->available);
+
+ rev->eof = 1;
+ rev->available = 0;
+ }
+
return n;
}
