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

util.adminstream: Fix traceback on double-close (fixes #1913)

Browse source 
In some circumstances, particularly with 'opportunistic_writes' and
'fatal_errors' enabled in the epoll backend, the connection may be closed
halfway through the session close process (because it contains debug logging,
which in the case of the watch:log() command, will trigger a write to the
socket).

The chosen fix is to cache session.conn in a local variable (we already did
this later on, but this pulls it up to the top of the function, which is
generally more correct anyway).
This commit is contained in:
Matthew Wild 2025-03-31 16:25:09 +01:00
parent 96aadab60b
commit 4f94d2425d
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/adminstream.lua
View file

@ -82,7 +82,8 @@ end
local function session_close(session, reason)
local log = session.log or log;
if session.conn then
local conn = session.conn;
if conn then
if session.notopen then
session:open_stream();
end
@ -115,7 +116,6 @@ local function session_close(session, reason)
session.log("debug", "c2s stream for %s closed: %s", session.full_jid or session.ip or "<unknown>", reason_text or "session closed");
-- Authenticated incoming stream may still be sending us stanzas, so wait for </stream:stream> from remote
local conn = session.conn;
if reason_text == nil and not session.notopen and session.type == "c2s" then
-- Grace time to process data from authenticated cleanly-closed stream
add_task(stream_close_timeout, function ()