Merge branch 'maint'

* maint:
  Updated OTP version
  Update release notes
  Update version numbers
  erts: Fix so that 81b628 (sigterm=kill) works
  Updated OTP version
  Prepare release
  Unconditionally clear IO buffers on send/shutdown errors

Conflicts:
	OTP_VERSION
	erts/emulator/sys/unix/sys.c
	erts/vsn.mk

2 files changed, 47 insertions, 2 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 8ae87ac280..e61114c504 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,34 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 8.3.5</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Active-mode TCP sockets are now cleaned up properly on
+	    send/shutdown errors.</p>
+          <p>
+	    Own Id: OTP-14441 Aux Id: ERL-430 </p>
+        </item>
+        <item>
+          <p>
+	    A code purge operation could under certain circumstances
+	    expand the size of hibernated processes.</p>
+          <p>
+	    Own Id: OTP-14444 Aux Id: ERIERL-24 </p>
+        </item>
+        <item>
+          <p>
+	    Fix so that the ERL_ZZ_SIGTERM_KILL introduced in
+	    erts-8.3.4 works.</p>
+          <p>
+	    Own Id: OTP-14451</p>
+        </item>
+      </list>
+    </section>
+
+</section>
 
 <section><title>Erts 8.3.4</title>
 
@@ -533,6 +561,22 @@
 
 </section>
 
+<section><title>Erts 8.1.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A code purge operation could under certain circumstances
+	    expand the size of hibernated processes.</p>
+          <p>
+	    Own Id: OTP-14444 Aux Id: ERIERL-24 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 8.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index bfebff5706..13ee935e45 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -10490,6 +10490,9 @@ static int tcp_send_or_shutdown_error(tcp_descriptor* desc, int err)
 	set_busy_port(desc->inet.port, 0);
     }
 
+    tcp_clear_output(desc);
+    tcp_clear_input(desc);
+
     /*
      * We used to handle "expected errors" differently from unexpected ones.
      * Now we handle all errors in the same way (unless the show_econnreset
@@ -10512,8 +10515,6 @@ static int tcp_send_or_shutdown_error(tcp_descriptor* desc, int err)
 	else
 	    desc_close(INETP(desc));
     } else {
-	tcp_clear_output(desc);
-	tcp_clear_input(desc);
 	tcp_close_check(desc);
 	erl_inet_close(INETP(desc));