mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-30 18:29:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: handling of getsockopt(TCP_DEFER_ACCEPT) failures.

Browse Source 
Recent Linux versions started to return EOPNOTSUPP to getsockopt() calls
on unix sockets, resulting in log pollution on binary upgrade.  Such errors
are silently ignored now.
This commit is contained in:
Maxim Dounin 2013-10-31 04:00:37 +04:00
parent 475832834b
commit 0eee3b0bc5
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/ngx_connection.c
View File

@ -93,8 +93,10 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
ngx_uint_t i; ngx_uint_t i;
ngx_listening_t *ls; ngx_listening_t *ls;
socklen_t olen; socklen_t olen;
#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) #if (NGX_HAVE_DEFERRED_ACCEPT)
ngx_err_t err; ngx_err_t err;
#endif
#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
struct accept_filter_arg af; struct accept_filter_arg af;
#endif #endif
#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
@ -248,7 +250,13 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
if (getsockopt(ls[i].fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &timeout, &olen) if (getsockopt(ls[i].fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &timeout, &olen)
== -1) == -1)
{ {
ngx_log_error(NGX_LOG_NOTICE, cycle->log, ngx_errno, err = ngx_errno;
if (err == NGX_EOPNOTSUPP) {
continue;
}
ngx_log_error(NGX_LOG_NOTICE, cycle->log, err,
"getsockopt(TCP_DEFER_ACCEPT) for %V failed, ignored", "getsockopt(TCP_DEFER_ACCEPT) for %V failed, ignored",
&ls[i].addr_text); &ls[i].addr_text);
continue; continue;

1
src/os/unix/ngx_errno.h
View File

@ -34,6 +34,7 @@ typedef int ngx_err_t;
#define NGX_ENOSPC ENOSPC #define NGX_ENOSPC ENOSPC
#define NGX_EPIPE EPIPE #define NGX_EPIPE EPIPE
#define NGX_EINPROGRESS EINPROGRESS #define NGX_EINPROGRESS EINPROGRESS
#define NGX_EOPNOTSUPP EOPNOTSUPP
#define NGX_EADDRINUSE EADDRINUSE #define NGX_EADDRINUSE EADDRINUSE
#define NGX_ECONNABORTED ECONNABORTED #define NGX_ECONNABORTED ECONNABORTED
#define NGX_ECONNRESET ECONNRESET #define NGX_ECONNRESET ECONNRESET

1
src/os/win32/ngx_errno.h
View File

@ -38,6 +38,7 @@ typedef DWORD ngx_err_t;
#define NGX_EPIPE EPIPE #define NGX_EPIPE EPIPE
#define NGX_EAGAIN WSAEWOULDBLOCK #define NGX_EAGAIN WSAEWOULDBLOCK
#define NGX_EINPROGRESS WSAEINPROGRESS #define NGX_EINPROGRESS WSAEINPROGRESS
#define NGX_EOPNOTSUPP WSAEOPNOTSUPP
#define NGX_EADDRINUSE WSAEADDRINUSE #define NGX_EADDRINUSE WSAEADDRINUSE
#define NGX_ECONNABORTED WSAECONNABORTED #define NGX_ECONNABORTED WSAECONNABORTED
#define NGX_ECONNRESET WSAECONNRESET #define NGX_ECONNRESET WSAECONNRESET