diff options
| author | Raimo Niskanen <[email protected]> | 2018-10-22 11:48:35 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2018-10-22 11:48:35 +0200 |
| commit | 2dbf5bf8c3b91c17ed79f13df3eb08c0b943218c (patch) | |
| tree | 9ca4a8d3f87f45b17757a55bdc925955b856fa1c /erts/preloaded/ebin | |
| parent | 57e9c998574695433fa21f8c42e2bccba77448ef (diff) | |
| parent | 6cf477d189ba993a5cb66aad421c9d7505da250c (diff) | |
| download | otp-2dbf5bf8c3b91c17ed79f13df3eb08c0b943218c.tar.gz otp-2dbf5bf8c3b91c17ed79f13df3eb08c0b943218c.tar.bz2 otp-2dbf5bf8c3b91c17ed79f13df3eb08c0b943218c.zip | |
Merge branch 'raimo/tcp-close-while-send/maint/ERL-561/OTP-12242' into maint
* raimo/tcp-close-while-send/maint/ERL-561/OTP-12242:
Write test case
Fix hanging gen_tcp send vs close race
Conflicts:
erts/preloaded/ebin/prim_inet.beam
Diffstat (limited to 'erts/preloaded/ebin')
| -rw-r--r-- | erts/preloaded/ebin/prim_inet.beam | bin | 80864 -> 82260 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/prim_inet.beam b/erts/preloaded/ebin/prim_inet.beam Binary files differindex 52bab031ff..eaa1e2cdf8 100644 --- a/erts/preloaded/ebin/prim_inet.beam +++ b/erts/preloaded/ebin/prim_inet.beam |