aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_connection.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-09-08 14:36:09 +0000
committerIgor Sysoev <igor@sysoev.ru>2005-09-08 14:36:09 +0000
commite573380f247f4840dd27b40e76c587196a84f106 (patch)
tree2bf9b16bbd3f9213fcb05fe3962938f24bf02677 /src/core/ngx_connection.c
parent6f8cd96a9b0394589fbcfa75e9d26ef4f881d51b (diff)
downloadnginx-e573380f247f4840dd27b40e76c587196a84f106.tar.gz
nginx-e573380f247f4840dd27b40e76c587196a84f106.zip
nginx-0.1.45-RELEASE importrelease-0.1.45
*) Change: the "ssl_engine" directive was canceled in the ngx_http_ssl_module and now is introduced at global level. *) Bugfix: the responses with SSI subrequests did not transferred via SSL connection. *) Various bug fixes in the IMAP/POP3 proxy.
Diffstat (limited to 'src/core/ngx_connection.c')
-rw-r--r--src/core/ngx_connection.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index fe75264db..c423c05ee 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -67,6 +67,7 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
ngx_listening_t *ls;
struct sockaddr_in *sin;
#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
+ ngx_err_t err;
socklen_t aflen;
struct accept_filter_arg af;
#endif
@@ -133,7 +134,13 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
if (getsockopt(ls[i].fd, SOL_SOCKET, SO_ACCEPTFILTER, &af, &aflen)
== -1)
{
- ngx_log_error(NGX_LOG_NOTICE, cycle->log, ngx_errno,
+ err = ngx_errno;
+
+ if (err == NGX_EINVAL) {
+ continue;
+ }
+
+ ngx_log_error(NGX_LOG_NOTICE, cycle->log, err,
"getsockopt(SO_ACCEPTFILTER) for %V failed, ignored",
&ls[i].addr_text);
continue;