summaryrefslogtreecommitdiff
path: root/doc/en
diff options
context:
space:
mode:
authorGu1ll4um3r0m41n <aeroxteam@gmail.com>2010-11-18 17:35:08 +0100
committerSebastien Helleu <flashcode@flashtux.org>2010-11-18 17:35:08 +0100
commitf15f114e4d4a1b649248301fef5cda176ad2a3a3 (patch)
treefd561d261459bb336570a567d81f04cec2e37372 /doc/en
parent4d1c9a831503a6cb2589266239c11368a12c8a5d (diff)
downloadweechat-f15f114e4d4a1b649248301fef5cda176ad2a3a3.zip
Fix infinite loop on gnutls handshake when connecting with SSL to server on wrong port or server with SSL problems (bug #27487)
Diffstat (limited to 'doc/en')
-rw-r--r--doc/en/autogen/user/weechat_options.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index 225cd21c1..c7ef6665f 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -588,6 +588,11 @@
** type: string
** values: any string (default value: `"%h/ssl/CAs.pem"`)
+* *weechat.network.gnutls_handshake_timeout*
+** description: `timeout (in seconds) for gnutls handshake`
+** type: integer
+** values: 1 .. 2147483647 (default value: `30`)
+
* *weechat.plugin.autoload*
** description: `comma separated list of plugins to load automatically at startup, "*" means all plugins found, a name beginning with "!" is a negative value to prevent a plugin from being loaded, names can start or end with "*" to match several plugins (examples: "*" or "*,!lua,!tcl")`
** type: string