add NGX_ENETDOWN, NGX_ENETUNREACH, and NGX_EHOSTDOWN

diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index e0a6ba23a811c81f9498a176d52c7282796978fd..b31daaa577813778ed067897e37e2465bf600d59 100644 (file)
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -767,6 +767,9 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text)
         || err == NGX_ENOTCONN
         || err == NGX_ETIMEDOUT
         || err == NGX_ECONNREFUSED
+        || err == NGX_ENETDOWN
+        || err == NGX_ENETUNREACH
+        || err == NGX_EHOSTDOWN
         || err == NGX_EHOSTUNREACH)
     {
         switch (c->log_error) {

diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index d8bd7f4a26a14bb36d3895d201708498809275eb..5ae7b23bfdabe8791cdd44fcfb22fbef86c13711 100644 (file)
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -143,8 +143,14 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
 
         if (err != NGX_EINPROGRESS && err != NGX_EAGAIN) {
 
-            if (err == NGX_ECONNREFUSED || err == NGX_EHOSTUNREACH) {
+            if (err == NGX_ECONNREFUSED
+                || err == NGX_ENETDOWN
+                || err == NGX_ENETUNREACH
+                || err == NGX_EHOSTDOWN
+                || err == NGX_EHOSTUNREACH)
+            {
                 level = NGX_LOG_ERR;
+
             } else {
                 level = NGX_LOG_CRIT;
             }

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 6de77429bbc3fa27620b6b243a2a0789e0fb1af9..edbb16fb87c009ba7cadfcc4c36e2927632fc93e 100644 (file)
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1121,6 +1121,9 @@ ngx_ssl_connection_error(ngx_connection_t *c, int sslerr, ngx_err_t err,
             || err == NGX_ETIMEDOUT
 #endif
             || err == NGX_ECONNREFUSED
+            || err == NGX_ENETDOWN
+            || err == NGX_ENETUNREACH
+            || err == NGX_EHOSTDOWN
             || err == NGX_EHOSTUNREACH)
         {
             switch (c->log_error) {

diff --git a/src/os/unix/ngx_errno.h b/src/os/unix/ngx_errno.h
index b941a43eb54db1a90b602498757ee654b145c597..c50d7879ac294427c921ec9bda739c0ea9840e35 100644 (file)
--- a/src/os/unix/ngx_errno.h
+++ b/src/os/unix/ngx_errno.h
@@ -37,6 +37,9 @@ typedef int               ngx_err_t;
 #define NGX_ETIMEDOUT     ETIMEDOUT
 #define NGX_ECONNREFUSED  ECONNREFUSED
 #define NGX_ENAMETOOLONG  ENAMETOOLONG
+#define NGX_ENETDOWN      ENETDOWN
+#define NGX_ENETUNREACH   ENETUNREACH
+#define NGX_EHOSTDOWN     EHOSTDOWN
 #define NGX_EHOSTUNREACH  EHOSTUNREACH
 #define NGX_ENOSYS        ENOSYS
 #define NGX_ECANCELED     ECANCELED

diff --git a/src/os/win32/ngx_errno.h b/src/os/win32/ngx_errno.h
index 588d28879bdb120909306140458574ba59a98275..52d04bc4d2e4b1a40e23ac6684136f9d5a4511b2 100644 (file)
--- a/src/os/win32/ngx_errno.h
+++ b/src/os/win32/ngx_errno.h
@@ -40,6 +40,9 @@ typedef DWORD                      ngx_err_t;
 #define NGX_ETIMEDOUT              WSAETIMEDOUT
 #define NGX_ECONNREFUSED           WSAECONNREFUSED
 #define NGX_ENAMETOOLONG           ERROR_BAD_PATHNAME
+#define NGX_ENETDOWN               WSAENETDOWN
+#define NGX_ENETUNREACH            WSAENETUNREACH
+#define NGX_EHOSTDOWN              WSAEHOSTDOWN
 #define NGX_EHOSTUNREACH           WSAEHOSTUNREACH
 #define NGX_ENOMOREFILES           ERROR_NO_MORE_FILES