From 7187d9a2c3728b1b32e9403ebb97e53c66e9b261 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 31 May 2016 14:39:58 +0200
Subject: kernel: Fix t_recv_delim on bsd

TCP messages to not travel instantly on loopback on bsd,
to we have to wait a little while for them to arrive.
---
 lib/kernel/test/gen_tcp_api_SUITE.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/test/gen_tcp_api_SUITE.erl b/lib/kernel/test/gen_tcp_api_SUITE.erl
index 6f6f53309e..54298e6309 100644
--- a/lib/kernel/test/gen_tcp_api_SUITE.erl
+++ b/lib/kernel/test/gen_tcp_api_SUITE.erl
@@ -135,8 +135,8 @@ t_recv_delim(Config) when is_list(Config) ->
     {ok, Client} = gen_tcp:connect(localhost, Port, Opts),
     {ok, A} = gen_tcp:accept(L),
     ok = gen_tcp:send(A, "abcXefgX"),
-    {ok, "abcX"} = gen_tcp:recv(Client, 0, 0),
-    {ok, "efgX"} = gen_tcp:recv(Client, 0, 0),
+    {ok, "abcX"} = gen_tcp:recv(Client, 0, 200),
+    {ok, "efgX"} = gen_tcp:recv(Client, 0, 200),
     ok = gen_tcp:close(Client),
     ok = gen_tcp:close(A),
     ok.
-- 
cgit v1.2.3


From 7c300789fffeacb24f1d00aa6e0797e06166c3c6 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Fri, 3 Jun 2016 11:59:54 +0200
Subject: kernel: Better explain controlling_process' tcp behaviour

---
 lib/kernel/doc/src/gen_tcp.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/kernel')

diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 8bd94892ad..15a2f02c76 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -223,6 +223,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>
 
-- 
cgit v1.2.3