commit 222c9f23bc6ac15d8f6fde530322b8f050e73bf3
author Igor Sysoev <igor@sysoev.ru> Wed Apr 01 16:42:09 2009 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Apr 01 16:42:09 2009 +0000
tree 20d05d2b8c7497a783b9228946f53a251d581113
parent 954dfd389fb1c672323abf985b761ec3f33640d6

r2561 merge:

ignore EINVAL from setsockopt() on Solaris

src/core/ngx_connection.c

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index b49a696..7982d96 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -779,12 +779,16 @@
 {
     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 @@
     {
         switch (c->log_error) {
 
+        case NGX_ERROR_IGNORE_EINVAL:
         case NGX_ERROR_IGNORE_ECONNRESET:
         case NGX_ERROR_INFO:
             level = NGX_LOG_INFO;

src/core/ngx_connection.h

diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index a2ae690..ac86796 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -71,10 +71,11 @@
 
 
 typedef enum {
-     NGX_ERROR_CRIT = 0,
+     NGX_ERROR_ALERT = 0,
      NGX_ERROR_ERR,
      NGX_ERROR_INFO,
-     NGX_ERROR_IGNORE_ECONNRESET
+     NGX_ERROR_IGNORE_ECONNRESET,
+     NGX_ERROR_IGNORE_EINVAL
 } ngx_connection_log_error_e;
 
 
@@ -135,7 +136,7 @@
 
     unsigned            buffered:8;
 
-    unsigned            log_error:2;     /* ngx_connection_log_error_e */
+    unsigned            log_error:3;     /* ngx_connection_log_error_e */
 
     unsigned            single_connection:1;
     unsigned            unexpected_eof:1;

src/http/ngx_http_request.c

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index bcfe21b..f7c2ffa 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -2264,8 +2264,15 @@
                        (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;
         }