Mercurial > hg > nginx

changeset 6462:fd4b52e74f96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed socket inheritance on reload and binary upgrade. On nginx reload or binary upgrade, an attempt is made to inherit listen sockets from the previous configuration. Previously, no check for socket type was made and the inherited socket could have the wrong type. On binary upgrade, socket type was not detected at all. Wrong socket type could lead to errors on that socket due to different logic and unsupported syscalls. For example, a UDP socket, inherited as TCP, lead to the following error after arrival of a datagram: "accept() failed (102: Operation not supported on socket)".
author Roman Arutyunyan <arut@nginx.com>
date Fri, 25 Mar 2016 14:10:38 +0300
parents a01e315b3a78
children 5df5d7d771f6
files src/core/ngx_connection.c src/core/ngx_cycle.c
diffstat 2 files changed, 20 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -210,6 +210,18 @@ ngx_set_inherited_sockets(ngx_cycle_t *c
 
         olen = sizeof(int);
 
+        if (getsockopt(ls[i].fd, SOL_SOCKET, SO_TYPE, (void *) &ls[i].type,
+                       &olen)
+            == -1)
+        {
+            ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno,
+                          "getsockopt(SO_TYPE) %V failed", &ls[i].addr_text);
+            ls[i].ignore = 1;
+            continue;
+        }
+
+        olen = sizeof(int);
+
         if (getsockopt(ls[i].fd, SOL_SOCKET, SO_RCVBUF, (void *) &ls[i].rcvbuf,
                        &olen)
             == -1)
@@ -274,6 +286,10 @@ ngx_set_inherited_sockets(ngx_cycle_t *c
 
 #endif
 
+        if (ls[i].type != SOCK_STREAM) {
+            continue;
+        }
+
 #if (NGX_HAVE_TCP_FASTOPEN)
 
         olen = sizeof(int);
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -512,6 +512,10 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
                     continue;
                 }
 
+                if (ls[i].type != nls[n].type) {
+                    continue;
+                }
+
                 if (ngx_cmp_sockaddr(nls[n].sockaddr, nls[n].socklen,
                                      ls[i].sockaddr, ls[i].socklen, 1)
                     == NGX_OK)