diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-01 16:42:09 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-01 16:42:09 +0000 |
| commit | 222c9f23bc6ac15d8f6fde530322b8f050e73bf3 (patch) | |
| tree | 20d05d2b8c7497a783b9228946f53a251d581113 /src/core/ngx_connection.c | |
| parent | 954dfd389fb1c672323abf985b761ec3f33640d6 (diff) | |
| download | nginx-222c9f23bc6ac15d8f6fde530322b8f050e73bf3.tar.gz nginx-222c9f23bc6ac15d8f6fde530322b8f050e73bf3.tar.bz2 | |
r2561 merge:
ignore EINVAL from setsockopt() on Solaris
Diffstat (limited to 'src/core/ngx_connection.c')
| -rw-r--r-- | src/core/ngx_connection.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index b49a696f2..7982d963e 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -779,12 +779,16 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) { ngx_uint_t level; - if (err == NGX_ECONNRESET - && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) - { + if (err == NGX_ECONNRESET && c->log_error == NGX_ERROR_IGNORE_ECONNRESET) { return 0; } +#if (NGX_SOLARIS) + if (err == NGX_EINVAL && c->log_error == NGX_ERROR_IGNORE_EINVAL) { + return 0; + } +#endif + if (err == 0 || err == NGX_ECONNRESET #if !(NGX_WIN32) @@ -800,6 +804,7 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) { switch (c->log_error) { + case NGX_ERROR_IGNORE_EINVAL: case NGX_ERROR_IGNORE_ECONNRESET: case NGX_ERROR_INFO: level = NGX_LOG_INFO; |