nginx-0.1.43-RELEASE import
*) Feature: the listen(2) backlog in the "listen" directive can be
changed using the -HUP signal.
*) Feature: the geo2nginx.pl script was added to contrib.
*) Change: the FastCGI parameters with the empty values now are passed
to a server.
*) Bugfix: the segmentation fault occurred or the worker process may
got caught in an endless loop if the proxied or FastCGI server sent
the "Cache-Control" header line and the "expires" directive was
used; in the proxied mode the the bug had appeared in 0.1.29.
diff --git a/src/os/unix/ngx_freebsd_sendfile_chain.c b/src/os/unix/ngx_freebsd_sendfile_chain.c
index a29aaf3..7ae5948 100644
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -57,9 +57,8 @@
#if (NGX_HAVE_KQUEUE)
if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) {
- ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno,
- "kevent() reported about an closed connection");
-
+ (void) ngx_connection_error(c, wev->kq_errno,
+ "kevent() reported about an closed connection");
wev->error = 1;
return NGX_CHAIN_ERROR;
}
@@ -228,8 +227,8 @@
if (err != NGX_EINTR) {
wev->error = 1;
- ngx_connection_error(c, err,
- ngx_tcp_nopush_n " failed");
+ (void) ngx_connection_error(c, err,
+ ngx_tcp_nopush_n " failed");
return NGX_CHAIN_ERROR;
}
@@ -276,7 +275,7 @@
} else {
wev->error = 1;
- ngx_connection_error(c, err, "sendfile() failed");
+ (void) ngx_connection_error(c, err, "sendfile() failed");
return NGX_CHAIN_ERROR;
}
}
diff --git a/src/os/unix/ngx_recv.c b/src/os/unix/ngx_recv.c
index 369be66..e96ca78 100644
--- a/src/os/unix/ngx_recv.c
+++ b/src/os/unix/ngx_recv.c
@@ -29,20 +29,12 @@
rev->ready = 0;
rev->eof = 1;
- ngx_log_error(NGX_LOG_INFO, c->log, rev->kq_errno,
- "kevent() reported about an closed connection");
-
if (rev->kq_errno) {
rev->error = 1;
ngx_set_socket_errno(rev->kq_errno);
- if (rev->kq_errno == NGX_ECONNRESET
- && c->log_error == NGX_ERROR_IGNORE_ECONNRESET)
- {
- return 0;
- }
-
- return NGX_ERROR;
+ return ngx_connection_error(c, rev->kq_errno,
+ "kevent() reported about an closed connection");
}
return 0;
diff --git a/src/os/unix/ngx_send.c b/src/os/unix/ngx_send.c
index ffe6bcb..167f2ec 100644
--- a/src/os/unix/ngx_send.c
+++ b/src/os/unix/ngx_send.c
@@ -20,9 +20,8 @@
#if (NGX_HAVE_KQUEUE)
if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) {
- ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno,
- "kevent() reported about an closed connection");
-
+ (void) ngx_connection_error(c, wev->kq_errno,
+ "kevent() reported about an closed connection");
wev->error = 1;
return NGX_ERROR;
}
@@ -63,7 +62,7 @@
} else {
wev->error = 1;
- ngx_connection_error(c, err, "send() failed");
+ (void) ngx_connection_error(c, err, "send() failed");
return NGX_ERROR;
}
}
diff --git a/src/os/unix/ngx_writev_chain.c b/src/os/unix/ngx_writev_chain.c
index ed3ad71..6d516ac 100644
--- a/src/os/unix/ngx_writev_chain.c
+++ b/src/os/unix/ngx_writev_chain.c
@@ -34,9 +34,8 @@
#if (NGX_HAVE_KQUEUE)
if ((ngx_event_flags & NGX_USE_KQUEUE_EVENT) && wev->pending_eof) {
- ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno,
- "kevent() reported about an closed connection");
-
+ (void) ngx_connection_error(c, wev->kq_errno,
+ "kevent() reported about an closed connection");
wev->error = 1;
return NGX_CHAIN_ERROR;
}
@@ -117,7 +116,7 @@
} else {
wev->error = 1;
- ngx_connection_error(c, err, "writev() failed");
+ (void) ngx_connection_error(c, err, "writev() failed");
return NGX_CHAIN_ERROR;
}
}
