From: Badlop <badlop@process-one.net>
Date: Fri, 27 Feb 2009 15:42:27 +0000 (+0000)
Subject: * src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
X-Git-Tag: v2.1.0~18^2~423
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a5fb440cc1d78e7412b1e708866c835ce2a9070;p=ejabberd

* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
and recent Openfire (thanks to Philipp Hancke)(EJAB-877)

SVN Revision: 1926
---

diff --git a/ChangeLog b/ChangeLog
index f5c73dde0..9f9c06e83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-27  Badlop  <badlop@process-one.net>
+
+	* src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
+	and recent Openfire (thanks to Philipp Hancke)(EJAB-877)
+
 2009-02-27  Evgeniy Khramtsov <ekhramtsov@process-one.net>
 
 	* src/mod_proxy65/mod_proxy65_service.erl: if an 'ip' option
diff --git a/src/tls/tls_drv.c b/src/tls/tls_drv.c
index 3ca8ba777..e7b07028b 100644
--- a/src/tls/tls_drv.c
+++ b/src/tls/tls_drv.c
@@ -367,7 +367,7 @@ static int tls_drv_control(ErlDrvData handle,
 	 if (command == SET_CERTIFICATE_FILE_ACCEPT)
 	    SSL_set_accept_state(d->ssl);
 	 else {
-	    SSL_set_options(d->ssl, SSL_OP_NO_SSLv2);
+	    SSL_set_options(d->ssl, SSL_OP_NO_SSLv2|SSL_OP_NO_TICKET);
 	    SSL_set_connect_state(d->ssl);
 	 }
 	 break;