Software / code / prosody
Changeset
3312:12fc7e005e8b
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 02 Jul 2010 17:44:14 +0100 |
| parents | 3308:f5243ca9662f (current diff) 3311:88cfe1bba690 (diff) |
| children | 3314:4019ad5c61e2 |
| files | core/s2smanager.lua net/server_select.lua |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/core/s2smanager.lua Fri Jul 02 17:43:01 2010 +0100 +++ b/core/s2smanager.lua Fri Jul 02 17:44:14 2010 +0100 @@ -208,7 +208,7 @@ function attempt_connection(host_session, err) 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 return false;
--- a/net/server_select.lua Fri Jul 02 17:43:01 2010 +0100 +++ b/net/server_select.lua Fri Jul 02 17:44:14 2010 +0100 @@ -343,9 +343,9 @@ _closelist[ handler ] = nil handler = nil end - if server then - server.remove( ) - end + if server then + server.remove( ) + end out_put "server.lua: closed client handler and removed socket from list" return true end @@ -479,11 +479,11 @@ bufferqueuelen = 0 bufferlen = 0 _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist - _ = needtls and handler:starttls(nil, true) _writetimes[ handler ] = nil if drain then drain(handler) end + _ = needtls and handler:starttls(nil, true) _ = toclose and handler:close( ) return true elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write
