aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-12-04 09:54:30 +0100
committerIngela Anderton Andin <[email protected]>2018-12-04 09:58:53 +0100
commit6ce31fab75e8768001366607b8be52df2809749d (patch)
treec3f52d36713b70be59241c7f937703476aaec03e /lib/ssl/doc
parent715a743bf25ab6e3ae51da59abdc4249a4bed833 (diff)
parentc44f975ac30e652ae08b878edf22bac3b6a1c8a2 (diff)
downloadotp-6ce31fab75e8768001366607b8be52df2809749d.tar.gz
otp-6ce31fab75e8768001366607b8be52df2809749d.tar.bz2
otp-6ce31fab75e8768001366607b8be52df2809749d.zip
Merge branch 'maint'
Conflicts: lib/ssl/src/dtls_connection.erl lib/ssl/src/ssl_connection.erl lib/ssl/src/tls_connection.erl
Diffstat (limited to 'lib/ssl/doc')
-rw-r--r--lib/ssl/doc/src/ssl_app.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index f6d9021d4a..893919aeb4 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. 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>
+ </item>
</taglist>
</section>