projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util.roster: Initial skeleton commit
[prosody.git]
/
net
/
server_select.lua
diff --git
a/net/server_select.lua
b/net/server_select.lua
index e3a389a878864aa959d40fd3338170aa5be1c5c4..298e560aa00cc6a5ab2eebde12b7b53634641a08 100644
(file)
--- a/
net/server_select.lua
+++ b/
net/server_select.lua
@@
-343,9
+343,9
@@
wrapconnection = function( server, listeners, socket, ip, serverport, clientport
_closelist[ handler ] = nil
handler = nil
end
_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
out_put "server.lua: closed client handler and removed socket from list"
return true
end
@@
-479,11
+479,11
@@
wrapconnection = function( server, listeners, socket, ip, serverport, clientport
bufferqueuelen = 0
bufferlen = 0
_sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist
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
_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
_ = toclose and handler:close( )
return true
elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write