mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 06:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.7->trunk

Browse source
This commit is contained in:
Matthew Wild 2010-07-02 17:44:14 +01:00
commit f654c43008
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/s2smanager.lua
View file

@ -208,7 +208,7 @@ end
function attempt_connection(host_session, err) function attempt_connection(host_session, err)
local from_host, to_host = host_session.from_host, host_session.to_host; local from_host, to_host = host_session.from_host, host_session.to_host;
local connect_host, connect_port = idna_to_ascii(to_host), 5269; local connect_host, connect_port = to_host and idna_to_ascii(to_host), 5269;
if not connect_host then if not connect_host then
return false; return false;

2
net/server_select.lua
View file

@ -479,11 +479,11 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
bufferqueuelen = 0 bufferqueuelen = 0
bufferlen = 0 bufferlen = 0
_sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist
_ = needtls and handler:starttls(nil, true)
_writetimes[ handler ] = nil _writetimes[ handler ] = nil
if drain then if drain then
drain(handler) drain(handler)
end end
_ = needtls and handler:starttls(nil, true)
_ = toclose and handler:close( ) _ = toclose and handler:close( )
return true return true
elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write