prosody
aa94cd27df4d
net/server_event.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

net/server_event.lua @ 7341:aa94cd27df4d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 06 Apr 2016 14:50:34 +0200
parent 7338:f8d37227acd7
parent 7339:b5565715fce8
child 7386:5a9af30d5737
comparison
equal deleted inserted replaced
7338:f8d37227acd7 7341:aa94cd27df4d
728 client:settimeout( 0 ) -- set nonblocking 728 client:settimeout( 0 ) -- set nonblocking
729 local res, err = client:connect( addr, serverport ) -- connect 729 local res, err = client:connect( addr, serverport ) -- connect
730 if res or ( err == "timeout" ) then 730 if res or ( err == "timeout" ) then
731 local ip, port = client:getsockname( ) 731 local ip, port = client:getsockname( )
732 local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx ) 732 local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx )
733 interface:_start_connection( sslctx )
734 debug( "new connection id:", interface.id ) 733 debug( "new connection id:", interface.id )
735 return interface, err 734 return interface, err
736 else 735 else
737 debug( "new connection failed:", err ) 736 debug( "new connection failed:", err )
738 return nil, err 737 return nil, err