diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2017-07-11 19:59:56 +0300 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2017-07-11 19:59:56 +0300 |
commit | da165aae88601628cef8db1646cd0ce3f0ee661f (patch) | |
tree | 9efe0e6d01d7ada4a54ff0ddbb340ff3f80d4dc8 /src/core/ngx_connection.c | |
parent | 5a5e74082d314d03f64a7672c2563dbe5567c78e (diff) |
Core: disabled SO_REUSEPORT when testing config (ticket #1300).
When closing a socket with SO_REUSEPORT, Linux drops all connections waiting
in this socket's listen queue. Previously, it was believed to only result
in connection resets when reconfiguring nginx to use smaller number of worker
processes. It also results in connection resets during configuration
testing though.
Workaround is to avoid using SO_REUSEPORT when testing configuration. It
should prevent listening sockets from being created if a conflicting socket
already exists, while still preserving detection of other possible errors.
It should also cover UDP sockets.
The only downside of this approach seems to be that a configuration testing
won't be able to properly report the case when nginx was compiled with
SO_REUSEPORT, but the kernel is not able to set it. Such errors will be
reported on a real start instead.
Diffstat (limited to 'src/core/ngx_connection.c')
-rw-r--r-- | src/core/ngx_connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index ec4692b0a..be1e89c5a 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -473,7 +473,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle) #if (NGX_HAVE_REUSEPORT) - if (ls[i].reuseport) { + if (ls[i].reuseport && !ngx_test_config) { int reuseport; reuseport = 1; |