From 93c6516da36b906d055c0ee4e81f6308e3f3b8df Mon Sep 17 00:00:00 2001 From: Hakase Date: Wed, 9 May 2018 04:55:40 +0900 Subject: [PATCH] Latest update - 7272 --- lib/zlib | 2 +- src/core/ngx_syslog.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/zlib b/lib/zlib index 9465261..5089329 160000 --- a/lib/zlib +++ b/lib/zlib @@ -1 +1 @@ -Subproject commit 94652610e8cb2334440f03b4248ed26b53322d3d +Subproject commit 50893291621658f355bc5b4d450a8d06a563053d diff --git a/src/core/ngx_syslog.c b/src/core/ngx_syslog.c index 0a67928..e2f9b6c 100644 --- a/src/core/ngx_syslog.c +++ b/src/core/ngx_syslog.c @@ -289,9 +289,7 @@ ngx_syslog_send(ngx_syslog_peer_t *peer, u_char *buf, size_t len) n = ngx_os_io.send(&peer->conn, buf, len); } -#if (NGX_HAVE_UNIX_DOMAIN) - - if (n == NGX_ERROR && peer->server.sockaddr->sa_family == AF_UNIX) { + if (n == NGX_ERROR) { if (ngx_close_socket(peer->conn.fd) == -1) { ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, ngx_socket_errno, @@ -301,8 +299,6 @@ ngx_syslog_send(ngx_syslog_peer_t *peer, u_char *buf, size_t len) peer->conn.fd = (ngx_socket_t) -1; } -#endif - return n; }