diff options
| author | Raimo Niskanen <[email protected]> | 2015-06-17 09:35:14 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2015-06-17 09:35:14 +0200 |
| commit | 5fc3d37e65d31dea7938750a3d75c7a1f7ebbd25 (patch) | |
| tree | ee317fe2e3fd790976db7b4a8d20951fe72bb972 /lib/kernel/src/gen_tcp.erl | |
| parent | 828fbf8c9bd838280c1fc8a9f9da065aba2ada0e (diff) | |
| parent | 485187dfdb5ec628efed755c88331ca296bc33dc (diff) | |
| download | otp-5fc3d37e65d31dea7938750a3d75c7a1f7ebbd25.tar.gz otp-5fc3d37e65d31dea7938750a3d75c7a1f7ebbd25.tar.bz2 otp-5fc3d37e65d31dea7938750a3d75c7a1f7ebbd25.zip | |
Merge branch 'nybek/fix_so_linger_zero__simple'
* nybek/fix_so_linger_zero__simple:
Update prim_inet.beam
Fix socket option {linger, {true, 0}} to abort TCP connections
Apply 'show_econnreset' socket option to send errors as well
Add 'show_econnreset' TCP socket option
Diffstat (limited to 'lib/kernel/src/gen_tcp.erl')
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index bc8ffbe5e3..86251fc8f1 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -58,6 +58,7 @@ {reuseaddr, boolean()} | {send_timeout, non_neg_integer() | infinity} | {send_timeout_close, boolean()} | + {show_econnreset, boolean()} | {sndbuf, non_neg_integer()} | {tos, non_neg_integer()} | {ipv6_v6only, boolean()}. @@ -89,6 +90,7 @@ reuseaddr | send_timeout | send_timeout_close | + show_econnreset | sndbuf | tos | ipv6_v6only. |