aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-07-24 16:47:09 +0200
committerHenrik Nord <[email protected]>2014-07-24 17:01:04 +0200
commit1b9383a8dbc03473860dfaacc7a02fbc8b1b1185 (patch)
tree56644c102684173987031696796a66292836eaab /lib/kernel/doc/src
parentb97b17d3e5355d503df5ed2f553767b73ac66903 (diff)
parent65e335e255cb76d979f605ed34700e4e02041139 (diff)
downloadotp-1b9383a8dbc03473860dfaacc7a02fbc8b1b1185.tar.gz
otp-1b9383a8dbc03473860dfaacc7a02fbc8b1b1185.tar.bz2
otp-1b9383a8dbc03473860dfaacc7a02fbc8b1b1185.zip
Merge branch 'maint-r16' into maint
Conflicts: erts/doc/src/notes.xml erts/preloaded/ebin/prim_inet.beam erts/vsn.mk lib/kernel/doc/src/notes.xml lib/kernel/vsn.mk
Diffstat (limited to 'lib/kernel/doc/src')
-rw-r--r--lib/kernel/doc/src/gen_tcp.xml7
-rw-r--r--lib/kernel/doc/src/notes.xml15
2 files changed, 21 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index dbd0d3c815..820ecd1e30 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>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 35889f9d11..b75644a847 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -292,6 +292,21 @@
corrected. </p> <p> Thanks to Max Treskin. </p>
<p>
Own Id: OTP-11730</p>
+<section><title>Kernel 2.16.4.1</title>
+
+ <section><title>Known Bugs and Problems</title>
+ <list>
+ <item>
+ <p>
+ When using gen_tcp:connect and the <c>fd</c> option with
+ <c>port</c> and/or <c>ip</c>, the <c>port</c> and
+ <c>ip</c> options were ignored. This has been fixed so
+ that if <c>port</c> and/or <c>ip</c> is specified
+ together with <c>fd</c> a bind is requested for that
+ <c>fd</c>. If <c>port</c> and/or <c>ip</c> is not
+ specified bind will not be called.</p>
+ <p>
+ Own Id: OTP-12061</p>
</item>
</list>
</section>