diff options
| author | Erlang/OTP <[email protected]> | 2014-07-22 18:01:19 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-07-22 18:01:19 +0200 |
| commit | 52810718bcd607ebb538036bdbb87b5e94634984 (patch) | |
| tree | b6cc19578e968c38a2510585e481b98c279bf7c4 /lib/kernel/doc/src/gen_tcp.xml | |
| parent | 450f0f893b5d28e6d967b163111f8a8a6032b0e1 (diff) | |
| parent | a60f3d879dfcdd018f1fea20790be901fbafeae4 (diff) | |
| download | otp-52810718bcd607ebb538036bdbb87b5e94634984.tar.gz otp-52810718bcd607ebb538036bdbb87b5e94634984.tar.bz2 otp-52810718bcd607ebb538036bdbb87b5e94634984.zip | |
Merge branch 'lukas/kernel/bind_with_fdopen/OTP-12061' into maint-r16
* lukas/kernel/bind_with_fdopen/OTP-12061:
Fix default behaviour for legacy fdopen
erts: Fix inet close on prebound fds
kernel: When doing an fdopen we now also bind the fd to the specified addr/port
Diffstat (limited to 'lib/kernel/doc/src/gen_tcp.xml')
| -rw-r--r-- | lib/kernel/doc/src/gen_tcp.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml index 11a0843c10..3ab459d4ed 100644 --- a/lib/kernel/doc/src/gen_tcp.xml +++ b/lib/kernel/doc/src/gen_tcp.xml @@ -112,7 +112,12 @@ do_recv(Sock, Bs) -> <item> <p>If a socket has somehow been connected without using <c>gen_tcp</c>, use this option to pass the file - descriptor for it.</p> + descriptor for it. If <c>{ip, ip_address()}</c> + and/or <c>{port, port_number()}</c> is combined with + this option the fd will be bound to the given interface + and port before connecting. If these options are not given + it is assumed that the fd is already bound appropriately. + </p> </item> <tag><c>inet</c></tag> |