diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-09-08 14:33:26 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2005-09-08 14:33:26 +0000 |
| commit | 99bbdbeffe6af6b81bf30b6906efdfbe2de0fd24 (patch) | |
| tree | 1c79fbf69ce2f17f935b6985307569c9dee9cf27 /src/core/ngx_connection.c | |
| parent | b3e4c1fa2347ea915acbf4b60c35ab26f3b7d073 (diff) | |
| download | nginx-0.1.tar.gz | |
*) Change: the "ssl_engine" directive is 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.c | 9 |
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; |