From 8a6390613225ec3f3e2d5bbf537d2e0737342e87 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Fri, 11 Jul 2014 10:46:37 +0200
Subject: kernel: When doing an fdopen we now also bind the fd to the specified
 addr/port

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

(limited to 'lib/kernel/doc')

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>
-- 
cgit v1.2.3


From 65e335e255cb76d979f605ed34700e4e02041139 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 22 Jul 2014 18:01:29 +0200
Subject: Update release notes

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

(limited to 'lib/kernel/doc')

diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index b2e89ea850..1e8ab3f14b 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -30,6 +30,27 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</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>
+
+</section>
+
 <section><title>Kernel 2.16.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3