diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 7 |
2 files changed, 4 insertions, 4 deletions
@@ -85,6 +85,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * aspell: fix detection of nicks with non-alphanumeric chars * guile: disable guile gmp allocator (fix crash on unload of relay plugin) (bug #40628) +* irc: clear the gnutls session in all cases after SSL connection error * irc: use MONITOR instead of ISON for /notify when it is available on server (task #11477) * irc: do not display names by default when joining a channel (task #13045) diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index d7b391401..3c42400f2 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -3004,12 +3004,11 @@ irc_server_close_connection (struct t_irc_server *server) { #ifdef HAVE_GNUTLS /* close SSL connection */ - if ((server->sock != -1) && (server->ssl_connected)) + if (server->ssl_connected) { - if (server->ssl_connected) + if (server->sock != -1) gnutls_bye (server->gnutls_sess, GNUTLS_SHUT_WR); - if (server->ssl_connected) - gnutls_deinit (server->gnutls_sess); + gnutls_deinit (server->gnutls_sess); } #endif } |