aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/doc/src/ssl_app.xml
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-16 10:48:12 +0200
committerIngela Anderton Andin <[email protected]>2015-09-16 10:48:12 +0200
commita12b70fa98eee10650c9de78d7d91516a2989999 (patch)
tree016d7910e943c7a98710589063e116596da53545 /lib/ssl/doc/src/ssl_app.xml
parente802c5d8152440cc59003f04271f7f1934453db4 (diff)
parent82aafa295a4004bcbd549c5bb888907e3ffc0c97 (diff)
downloadotp-a12b70fa98eee10650c9de78d7d91516a2989999.tar.gz
otp-a12b70fa98eee10650c9de78d7d91516a2989999.tar.bz2
otp-a12b70fa98eee10650c9de78d7d91516a2989999.zip
Merge branch 'ia/ssl/downgrade/alert_timout/OTP-11397/OTP-12832' into maint
* ia/ssl/downgrade/alert_timout/OTP-11397/OTP-12832: ssl: Better timeout gaurds ssl: Improve shutdown logic
Diffstat (limited to 'lib/ssl/doc/src/ssl_app.xml')
-rw-r--r--lib/ssl/doc/src/ssl_app.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/ssl/doc/src/ssl_app.xml b/lib/ssl/doc/src/ssl_app.xml
index 2b6dc7e8be..51ce0cedf1 100644
--- a/lib/ssl/doc/src/ssl_app.xml
+++ b/lib/ssl/doc/src/ssl_app.xml
@@ -87,6 +87,17 @@
marker="ssl#clear_pem_cache-0">ssl:clear_pem_cache/0</seealso>
</item>
+ <tag><c><![CDATA[alert_timeout = integer() <optional>]]></c></tag>
+ <item>
+ <p>
+ Number of milliseconds between sending of a fatal alert and
+ closing the connection. Waiting a little while improves the
+ peers chances to properly receiving the alert so it may
+ shutdown gracefully. Defaults to 5000 milliseconds.
+ </p>
+ </item>
+
+
</taglist>
</section>