From fd6a6a5514c420dae2b393f62fee65f87758dec9 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 21 Jan 2019 18:39:19 +0300 Subject: [PATCH] Fixed processing Unix listening socket failures. This is related to issue #198 on GitHub. --- src/nxt_main_process.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c index 819ed44c..a4c3f119 100644 --- a/src/nxt_main_process.c +++ b/src/nxt_main_process.c @@ -1116,24 +1116,23 @@ nxt_main_listening_socket(nxt_sockaddr_t *sa, nxt_listening_socket_t *ls) break; } - goto next; - } - + } else #endif + { + switch (err) { - switch (err) { + case EACCES: + ls->error = NXT_SOCKET_ERROR_PORT; + break; - case EACCES: - ls->error = NXT_SOCKET_ERROR_PORT; - break; + case EADDRINUSE: + ls->error = NXT_SOCKET_ERROR_INUSE; + break; - case EADDRINUSE: - ls->error = NXT_SOCKET_ERROR_INUSE; - break; - - case EADDRNOTAVAIL: - ls->error = NXT_SOCKET_ERROR_NOADDR; - break; + case EADDRNOTAVAIL: + ls->error = NXT_SOCKET_ERROR_NOADDR; + break; + } } ls->end = nxt_sprintf(ls->start, ls->end, "bind(\\\"%*s\\\") failed %E", @@ -1143,8 +1142,6 @@ nxt_main_listening_socket(nxt_sockaddr_t *sa, nxt_listening_socket_t *ls) #if (NXT_HAVE_UNIX_DOMAIN) -next: - if (sa->u.sockaddr.sa_family == AF_UNIX) { char *filename; mode_t access;