diff options
| author | Raimo Niskanen <[email protected]> | 2019-07-31 16:19:42 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-07-31 16:39:28 +0200 |
| commit | 1a8f8b199589b5a16b22489e6501f13fbc2e1b54 (patch) | |
| tree | e8332f3c86a546f23d3b398e3eba9ba502e59a0c | |
| parent | 6c4ad85880375b242ac48a2bf439887f503ce203 (diff) | |
| parent | 387974e678423b403439c90a0a4026f258be891f (diff) | |
| download | otp-1a8f8b199589b5a16b22489e6501f13fbc2e1b54.tar.gz otp-1a8f8b199589b5a16b22489e6501f13fbc2e1b54.tar.bz2 otp-1a8f8b199589b5a16b22489e6501f13fbc2e1b54.zip | |
Merge branch 'raimo/inherit-listen-options/OTP-15824' into maint
* raimo/inherit-listen-options/OTP-15824:
The linger option is not transferred on *BSD
| -rw-r--r-- | erts/preloaded/ebin/prim_inet.beam | bin | 81424 -> 81508 bytes | |||
| -rw-r--r-- | erts/preloaded/src/prim_inet.erl | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam Binary files differindex f67b660a08..f77e9e863d 100644 --- a/erts/preloaded/ebin/prim_inet.beam +++ b/erts/preloaded/ebin/prim_inet.beam diff --git a/erts/preloaded/src/prim_inet.erl b/erts/preloaded/src/prim_inet.erl index 374facb2a3..4dab3de006 100644 --- a/erts/preloaded/src/prim_inet.erl +++ b/erts/preloaded/src/prim_inet.erl @@ -427,7 +427,7 @@ accept_opts(L, S, FamilyOpts) -> case getopts( L, - [active, nodelay, keepalive, delay_send, priority] + [active, nodelay, keepalive, delay_send, priority, linger] ++ FamilyOpts) of {ok, Opts} -> |