diff options
| author | Lukas Larsson <[email protected]> | 2012-05-23 11:25:08 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-05-23 11:25:08 +0200 |
| commit | 90cbd16d39bb00c6eb4f3ffe04a406f800ee9126 (patch) | |
| tree | 8b5c7b186208b84797ec9b614443c802392133ae /lib/kernel/doc | |
| parent | 0d98106bfa6f0c637019604f4c25e6c48cd1d5fc (diff) | |
| parent | 1ba2039020738673b3913be0e48d83713503a3b7 (diff) | |
| download | otp-90cbd16d39bb00c6eb4f3ffe04a406f800ee9126.tar.gz otp-90cbd16d39bb00c6eb4f3ffe04a406f800ee9126.tar.bz2 otp-90cbd16d39bb00c6eb4f3ffe04a406f800ee9126.zip | |
Merge branch 'maint'
* maint:
Add testcase for controlling_process(P,self())
Fix port leaking after controlling_process(Port, self())
Diffstat (limited to 'lib/kernel/doc')
| -rw-r--r-- | lib/kernel/doc/src/gen_tcp.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/gen_udp.xml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml index daf26a0b63..11a0843c10 100644 --- a/lib/kernel/doc/src/gen_tcp.xml +++ b/lib/kernel/doc/src/gen_tcp.xml @@ -324,7 +324,7 @@ do_recv(Sock, Bs) -> <c><anno>Socket</anno></c>. The controlling process is the process which receives messages from the socket. If called by any other process than the current controlling process, - <c>{error, eperm}</c> is returned.</p> + <c>{error, not_owner}</c> is returned.</p> </desc> </func> <func> diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml index 6b83dfa030..726dc30546 100644 --- a/lib/kernel/doc/src/gen_udp.xml +++ b/lib/kernel/doc/src/gen_udp.xml @@ -189,7 +189,9 @@ <desc> <p>Assigns a new controlling process <c><anno>Pid</anno></c> to <c><anno>Socket</anno></c>. The controlling process is the process which - receives messages from the socket.</p> + receives messages from the socket. If called by any other + process than the current controlling process, + <c>{error, not_owner}</c> is returned.</p> </desc> </func> <func> |