Mercurial > prosody-hg

diff plugins/mod_s2s/s2sout.lib.lua @ 5861:c3ee62b3bdfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 07 Oct 2013 12:56:53 +0200
parents e327f2d4e09f
children ac0879a8190a
line wrap: on
line diff
--- a/plugins/mod_s2s/s2sout.lib.lua	Sun Oct 06 23:53:15 2013 +0200
+++ b/plugins/mod_s2s/s2sout.lib.lua	Mon Oct 07 12:56:53 2013 +0200
@@ -270,6 +270,7 @@
 	-- Reset secure flag in case this is another
 	-- connection attempt after a failed STARTTLS
 	host_session.secure = nil;
+	host_session.encrypted = nil;
 
 	local conn, handler;
 	local proto = connect_host.proto;