Mercurial > prosody-hg

comparison 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
comparison
equal deleted inserted replaced
5858:89b16a160cbc 5861:c3ee62b3bdfe
268 (host_session.log or log)("debug", "Beginning new connection attempt to %s ([%s]:%d)", host_session.to_host, connect_host.addr, connect_port); 268 (host_session.log or log)("debug", "Beginning new connection attempt to %s ([%s]:%d)", host_session.to_host, connect_host.addr, connect_port);
269 269
270 -- Reset secure flag in case this is another 270 -- Reset secure flag in case this is another
271 -- connection attempt after a failed STARTTLS 271 -- connection attempt after a failed STARTTLS
272 host_session.secure = nil; 272 host_session.secure = nil;
273 host_session.encrypted = nil;
273 274
274 local conn, handler; 275 local conn, handler;
275 local proto = connect_host.proto; 276 local proto = connect_host.proto;
276 if proto == "IPv4" then 277 if proto == "IPv4" then
277 conn, handler = socket.tcp(); 278 conn, handler = socket.tcp();