From 6168cf2f5f8b5839b1a56ce870658d76faf3c22f Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 19 Nov 2018 13:50:35 +0100
Subject: ssl: Internaly use {active, N}

Make next_record an internal help function to next_event and avoid
duplicate calls to tls_socket:setopts for setting the active option.
---
 lib/ssl/doc/src/ssl_app.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'lib/ssl/doc')

diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index f6d9021d4a..53b899058f 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -171,6 +171,20 @@
 	  shutdown gracefully. Defaults to 5000 milliseconds.   
 	</p>
       </item>
+
+      <tag><c><![CDATA[internal_active_n = integer() <optional>]]></c></tag>
+        <item>
+	<p>
+	  For TLS connections this value is used to handle the
+	  internal socket. As the implementation was changed from an
+	  active once to an active N behavior (N = 100), for
+	  performance reasons, this option exist for possible tweaking
+	  or restoring of the old behavior (internal_active_n = 1) in
+	  unforeseen scenarios.  This option will not affect erlang
+	  distribution over TLS that will always run in active N mode.
+	  Added in ssl-9.1 (OTP-21.2).
+	</p>
+      </item>
     </taglist>
   </section>
 
-- 
cgit v1.2.3


From 15aa90e8d852e27a6dc28c713aee66f57574705e Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Thu, 29 Nov 2018 16:24:33 +0100
Subject: ssl: Correct ssl:shutdown

When internaly using active N, bugs in shutdown implementation where reveled.
---
 lib/ssl/doc/src/ssl_app.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/ssl/doc')

diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index 53b899058f..893919aeb4 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -180,7 +180,7 @@
 	  active once to an active N behavior (N = 100), for
 	  performance reasons, this option exist for possible tweaking
 	  or restoring of the old behavior (internal_active_n = 1) in
-	  unforeseen scenarios.  This option will not affect erlang
+	  unforeseen scenarios.  The option will not affect erlang
 	  distribution over TLS that will always run in active N mode.
 	  Added in ssl-9.1 (OTP-21.2).
 	</p>
-- 
cgit v1.2.3