Mercurial > prosody-hg

comparison 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
comparison
equal deleted inserted replaced
5858:89b16a160cbc 5861:c3ee62b3bdfe
281 session.version = tonumber(attr.version) or 0; 281 session.version = tonumber(attr.version) or 0;
282 282
283 -- TODO: Rename session.secure to session.encrypted 283 -- TODO: Rename session.secure to session.encrypted
284 if session.secure == false then 284 if session.secure == false then
285 session.secure = true; 285 session.secure = true;
286 session.encrypted = true;
286 287
287 local sock = session.conn:socket(); 288 local sock = session.conn:socket();
288 if sock.info then 289 if sock.info then
289 local info = sock:info(); 290 local info = sock:info();
290 (session.log or log)("info", "Stream encrypted (%s with %s)", info.protocol, info.cipher); 291 (session.log or log)("info", "Stream encrypted (%s with %s)", info.protocol, info.cipher);