diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-12-07 14:51:31 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-12-07 14:51:31 +0000 |
| commit | cdc463042b9406e4703d21202bc363e86321bb5d (patch) | |
| tree | 1f6d050377dafbf42bb3d7c8c7e15e86939500ff /src/os/unix/ngx_freebsd_sendfile_chain.c | |
| parent | c20f0c28ff5478dcafd2ce2e5056da3757eb62ff (diff) | |
| download | nginx-cdc463042b9406e4703d21202bc363e86321bb5d.tar.gz nginx-cdc463042b9406e4703d21202bc363e86321bb5d.zip | |
nginx-0.3.15-RELEASE importrelease-0.3.15
*) Feature: the new 444 code of the "return" directive to close
connection.
*) Feature: the "so_keepalive" directive in IMAP/POP3 proxy.
*) Bugfix: if there are unclosed connection nginx now calls abort()
only on gracefull quit and active "debug_points" directive.
Diffstat (limited to 'src/os/unix/ngx_freebsd_sendfile_chain.c')
| -rw-r--r-- | src/os/unix/ngx_freebsd_sendfile_chain.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c index 662b3347b..7ae594897 100644 --- a/src/os/unix/ngx_freebsd_sendfile_chain.c +++ b/src/os/unix/ngx_freebsd_sendfile_chain.c @@ -56,11 +56,7 @@ ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) #if (NGX_HAVE_KQUEUE) - if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) - && wev->pending_eof - /* FreeBSD 5.x-6.x may erroneously report ETIMEDOUT */ - && wev->kq_errno != NGX_ETIMEDOUT) - { + if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) { (void) ngx_connection_error(c, wev->kq_errno, "kevent() reported about an closed connection"); wev->error = 1; |