Mercurial > prosody-hg

diff plugins/mod_s2s/mod_s2s.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 d21ea6001bba
line wrap: on
line diff
--- a/plugins/mod_s2s/mod_s2s.lua	Sun Oct 06 23:53:15 2013 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Mon Oct 07 12:56:53 2013 +0200
@@ -283,6 +283,7 @@
 	-- TODO: Rename session.secure to session.encrypted
 	if session.secure == false then
 		session.secure = true;
+		session.encrypted = true;
 
 		local sock = session.conn:socket();
 		if sock.info then