aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
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 /erts/doc
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 'erts/doc')
-rw-r--r--erts/doc/src/notes.xml15
1 files changed, 15 insertions, 0 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 086d29c668..50de3c5d4d 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -940,6 +940,21 @@
Thanks to Matwey V. Kornilov</p>
<p>
Own Id: OTP-11829</p>
+<section><title>Erts 5.10.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>