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

Flush write queue before closing socket

Browse source
This commit is contained in:
Matthew Wild 2008-11-18 05:06:50 +00:00
parent 7c92b4e9a1
commit 3ac3b3bc2d
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/server.lua
View file

@ -225,6 +225,7 @@ wrapsslclient = function( listener, socket, ip, serverport, clientport, mode, ss
--return shutdown( socket, pattern ) --return shutdown( socket, pattern )
end end
handler.close = function( closed ) handler.close = function( closed )
if eol then handler._dispatchdata(); end
close( socket ) close( socket )
writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen
readlen = removesocket( readlist, socket, readlen ) readlen = removesocket( readlist, socket, readlen )
@ -364,7 +365,8 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss
local err local err
socket:settimeout( 0 ) socket:settimeout( 0 )
out_put("setting linger on "..tostring(socket))
socket:setoption("linger", { on = true, timeout = 10 });
--// private closures of the object //-- --// private closures of the object //--
local writequeue = { } -- buffer for messages to send local writequeue = { } -- buffer for messages to send
@ -404,6 +406,7 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss
--return shutdown( socket, pattern ) --return shutdown( socket, pattern )
end end
handler.close = function( closed ) handler.close = function( closed )
if eol then handler._dispatchdata(); end
close( socket ) close( socket )
writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen
readlen = removesocket( readlist, socket, readlen ) readlen = removesocket( readlist, socket, readlen )
@ -614,6 +617,7 @@ wraptcpclient = function( listener, socket, ip, serverport, clientport, mode )
return shutdown( socket, pattern ) return shutdown( socket, pattern )
end end
handler.close = function( closed ) handler.close = function( closed )
if eol then handler._dispatchdata(); end
_ = not closed and shutdown( socket ) _ = not closed and shutdown( socket )
_ = not closed and close( socket ) _ = not closed and close( socket )
writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen writelen = ( eol and removesocket( writelist, socket, writelen ) ) or writelen