diff options
| author | Raimo Niskanen <[email protected]> | 2019-06-12 14:19:40 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-06-12 14:19:40 +0200 |
| commit | 81f318e9024321cf4a0e9cadb59fc25dbcc6a00d (patch) | |
| tree | c244b947d87ee49ee1d3f17981147a4f5dcf27db /erts | |
| parent | 51120ab353aba2f4d19a3e132525181aa079de7b (diff) | |
| parent | a5d80667f781eae20ac8224a054c9bdb7be9b83a (diff) | |
| download | otp-81f318e9024321cf4a0e9cadb59fc25dbcc6a00d.tar.gz otp-81f318e9024321cf4a0e9cadb59fc25dbcc6a00d.tar.bz2 otp-81f318e9024321cf4a0e9cadb59fc25dbcc6a00d.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index c93966d24f..0d9b4ff59f 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1997-2018. All Rights Reserved. + * Copyright Ericsson AB 1997-2019. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -9846,10 +9846,8 @@ static tcp_descriptor* tcp_inet_copy(tcp_descriptor* desc,SOCKET s, copy_desc->send_timeout = desc->send_timeout; copy_desc->send_timeout_close = desc->send_timeout_close; - if (desc->tcp_add_flags & TCP_ADDF_SHOW_ECONNRESET) - copy_desc->tcp_add_flags |= TCP_ADDF_SHOW_ECONNRESET; - else - copy_desc->tcp_add_flags &= ~TCP_ADDF_SHOW_ECONNRESET; + copy_desc->tcp_add_flags = desc->tcp_add_flags + & (TCP_ADDF_SHOW_ECONNRESET | TCP_ADDF_LINGER_ZERO); /* The new port will be linked and connected to the original caller */ port = driver_create_port(port, owner, "tcp_inet", (ErlDrvData) copy_desc); |