aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src/gen_tcp.xml
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-06-14 10:22:40 +0200
committerLukas Larsson <[email protected]>2016-06-14 10:22:40 +0200
commit1418cbbb689dc2c88ecceaedb4eba33061d338e7 (patch)
tree348257a01f32af0ceb349933c4a7dbe64c884df7 /lib/kernel/doc/src/gen_tcp.xml
parent0c8357d15dd2573331056a308e3744927ce406ad (diff)
parent9411a2098d983cac05fd7198bba26b9d56aa484a (diff)
downloadotp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.tar.gz
otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.tar.bz2
otp-1418cbbb689dc2c88ecceaedb4eba33061d338e7.zip
Merge branch 'lukas/erts/testfixes-19'
* lukas/erts/testfixes-19: erts: Increase bif and nif call_time trace test erts: Fix distribution_SUITE:bulk_send_bigbig on windows erts: Ensure bs_add_overflow test has enough memory kernel: Better explain controlling_process' tcp behaviour kernel: Fix t_recv_delim on bsd os_mon: Make sure to start/stop os_mon in tests correctly ssl: Fix use_interface dist_SSL test erl_interface: Fix signed int overflow tc bug erts: fix atom_roundtrip_r15b tc erts: Require more memory for debug tests
Diffstat (limited to 'lib/kernel/doc/src/gen_tcp.xml')
-rw-r--r--lib/kernel/doc/src/gen_tcp.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 88135ea43d..83242c2df8 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -232,6 +232,14 @@ do_recv(Sock, Bs) ->
that receives messages from the socket. If called by any other
process than the current controlling process,
<c>{error, not_owner}</c> is returned.</p>
+ <p>If the socket is set in active mode, this function
+ will transfer any messages in the mailbox of the caller
+ to the new controlling process.
+ If any other process is interacting with the socket while
+ the transfer is happening, the transfer may not work correctly
+ and messages may remain in the caller's mailbox. For instance
+ changing the sockets active mode before the transfere is complete
+ may cause this.</p>
</desc>
</func>