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/http/ngx_http_request.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/http/ngx_http_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index bcfe21bbc..f7c2ffa46 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -2264,8 +2264,15 @@ ngx_http_set_keepalive(ngx_http_request_t *r) (const void *) &tcp_nodelay, sizeof(int)) == -1) { +#if (NGX_SOLARIS) + /* Solaris returns EINVAL if a socket has been shut down */ + c->log_error = NGX_ERROR_IGNORE_EINVAL; +#endif + ngx_connection_error(c, ngx_socket_errno, "setsockopt(TCP_NODELAY) failed"); + + c->log_error = NGX_ERROR_INFO; ngx_http_close_connection(c); return; } |