summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2010-01-27 11:18:39 +0100
committerSebastien Helleu <flashcode@flashtux.org>2010-01-27 11:18:39 +0100
commit765d2ee4768c1c5e07a99a9ee053282c213fe2e8 (patch)
treeec1098b7a780a282e9a7f633ce8a187fff61cc3e
parentVersion 0.3.1 (diff)
downloadweechat-765d2ee4768c1c5e07a99a9ee053282c213fe2e8.tar.xz
weechat-765d2ee4768c1c5e07a99a9ee053282c213fe2e8.zip
Fix bug with SSL connection to IRC server (fails sometimes when ssl_verify is on) (bug #28741)
-rw-r--r--ChangeLog7
-rw-r--r--src/plugins/irc/irc-server.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b7ccf96f..269588653 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
WeeChat ChangeLog
=================
FlashCode <flashcode@flashtux.org>
-v0.3.1, 2010-01-23
+v0.3.1.1, 2010-01-27
+Version 0.3.1.1 (under dev!)
+--------------------------
+* irc: fix bug with SSL connection (fails sometimes when ssl_verify is on)
+ (bug #28741)
+
Version 0.3.1 (2010-01-23)
--------------------------
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index eee8b4684..4ddca4a50 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -2238,6 +2238,8 @@ irc_server_gnutls_callback (void *data, gnutls_session_t tls_session,
(void) nreq;
(void) pk_algos;
(void) pk_algos_len;
+
+ rc = 0;
if (!data)
return -1;