aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2019-07-16 13:35:47 +0200
committerRaimo Niskanen <[email protected]>2019-07-16 15:31:23 +0200
commit387974e678423b403439c90a0a4026f258be891f (patch)
tree7363c8b4330c76bd3aa699360bfa9de63c797c13
parent86716445f382abad9b0af4e178ae526015ed074d (diff)
downloadotp-387974e678423b403439c90a0a4026f258be891f.tar.gz
otp-387974e678423b403439c90a0a4026f258be891f.tar.bz2
otp-387974e678423b403439c90a0a4026f258be891f.zip
The linger option is not transferred on *BSD
-rw-r--r--erts/preloaded/ebin/prim_inet.beambin81424 -> 81508 bytes
-rw-r--r--erts/preloaded/src/prim_inet.erl2
2 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam
index f67b660a08..a15d12c37d 100644
--- a/erts/preloaded/ebin/prim_inet.beam
+++ b/erts/preloaded/ebin/prim_inet.beam
Binary files differ
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} ->