From f2602fcff6587dff31cd45fdd0cfb157f75e1909 Mon Sep 17 00:00:00 2001 From: chenwei Date: Tue, 10 Apr 2018 17:28:10 +0800 Subject: [PATCH] Nginx: bugfix, shouldnot pollute `socket type` --- app/nginx-1.11.10/src/event/ngx_event_connect.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/nginx-1.11.10/src/event/ngx_event_connect.c b/app/nginx-1.11.10/src/event/ngx_event_connect.c index 4343340c..64c0ea1e 100644 --- a/app/nginx-1.11.10/src/event/ngx_event_connect.c +++ b/app/nginx-1.11.10/src/event/ngx_event_connect.c @@ -44,12 +44,13 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc) to explicitly call the needed socket() function. */ if (!pc->belong_to_host) { - type |= SOCK_FSTACK; + s = ngx_socket(pc->sockaddr->sa_family, type | SOCK_FSTACK, 0); + } else { + s = ngx_socket(pc->sockaddr->sa_family, type, 0); } -#endif - +#else s = ngx_socket(pc->sockaddr->sa_family, type, 0); - +#endif ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0, "%s socket %d", (type == SOCK_STREAM) ? "stream" : "dgram", s);