prosody-hg: net/server_epoll.lua history

Merge 13.0->trunk

Wed, 29 Apr 2026 17:12:59 +0100

Merge 13.0->trunk

Merge 0.12->13.0

Wed, 29 Apr 2026 17:12:11 +0100

Merge 0.12->13.0

net.server_epoll: Clean up timers after disconnection

Thu, 16 Apr 2026 19:00:22 +0100

net.server_epoll: Clean up timers after disconnection

Merge 13.0->trunk

Fri, 17 Apr 2026 14:35:32 +0100

Merge 13.0->trunk

net.server_epoll: Clean up timers after disconnection

Thu, 16 Apr 2026 19:00:22 +0100

net.server_epoll: Clean up timers after disconnection

net.server_epoll: Downgrade buffer related log message to noise

Wed, 15 Oct 2025 02:12:51 +0200

net.server_epoll: Downgrade buffer related log message to noise

This one is very noisy, being printed at least once per write, and is
presumably mostly of interest when debugging or tuning server_epoll.

net.server_epoll: Restore idle checks after pause (e.g. rate limits)

Sun, 24 Aug 2025 18:15:09 +0200

net.server_epoll: Restore idle checks after pause (e.g. rate limits)

It seems that under some conditions the read timeout is not recreated.
This led to various dead connection accumulating.

Code review noticed this case, easily triggered by enabling rate limits.
Uncertain if there may be others.

net.server_epoll: Use correct connection timeout when initiating Direct TLS

Wed, 02 Apr 2025 15:54:31 +0200

net.server_epoll: Use correct connection timeout when initiating Direct TLS

Otherwise it takes a lot longer to time out Direct TLS connections than
TCP / STARTTLS connections.

net.server_epoll: Improve readability of DANE noise

Thu, 27 Feb 2025 21:36:43 +0100

net.server_epoll: Improve readability of DANE noise

Serialized Lua is not the most readable form of TLSA records.

net.server_epoll: Call :shutdown() on TLS sockets when supported

Thu, 06 Feb 2025 15:04:38 +0000

net.server_epoll: Call :shutdown() on TLS sockets when supported

Comment from Matthew:

This fixes a potential issue where the Prosody process gets blocked on sockets
waiting for them to close. Unlike non-TLS sockets, closing a TLS socket sends
layer 7 data, and this can cause problems for sockets which are in the process
of being cleaned up.

This depends on LuaSec changes which are not yet upstream.

From Martijn's original email:

So first my analysis of luasec. in ssl.c the socket is put into blocking
mode right before calling SSL_shutdown() inside meth_destroy(). My best
guess to why this is is because meth_destroy is linked to the __close
and __gc methods, which can't exactly be called multiple times and
luasec does want to make sure that a tls session is shutdown as clean
as possible.
I can't say I disagree with this reasoning and don't want to change this
behaviour. My solution to this without changing the current behaviour is
to introduce a shutdown() method. I am aware that this overlaps in a
conflicting way with tcp's shutdown method, but it stays close to the
OpenSSL name. This method calls SSL_shutdown() in the current
(non)blocking mode of the underlying socket and returns a boolean
whether or not the shutdown is completed (matching SSL_shutdown()'s 0
or 1 return values), and returns the familiar ssl_ioerror() strings on
error with a false for completion. This error can then be used to
determine if we have wantread/wantwrite to finalize things. Once
meth_shutdown() has been called once a shutdown flag will be set, which
indicates to meth_destroy() that the SSL_shutdown() has been handled
by the application and it shouldn't be needed to set the socket to
blocking mode. I've left the SSL_shutdown() call in the
LSEC_STATE_CONNECTED to prevent TOCTOU if the application reaches a
timeout for the shutdown code, which might allow SSL_shutdown() to
clean up anyway at the last possible moment.
Another thing I've changed to luasec is the call to socket_setblocking()
right before calling close(2) in socket_destroy() in usocket.c.
According to the latest POSIX[0]:
Note that the requirement for close() on a socket to block for up to
the current linger interval is not conditional on the O_NONBLOCK
setting.
Which I read to mean that removing O_NONBLOCK on the socket before close
doesn't impact the behaviour and only causes noise in system call
tracers. I didn't touch the windows bits of this, since I don't do
windows.

For the prosody side of things I've made the TLS shutdown bits resemble
interface:onwritable(), and put it under a combined guard of self._tls
and self.conn.shutdown. The self._tls bit is there to prevent getting
stuck on this condition, and self.conn.shutdown is there to prevent the
code being called by instances where the patched luasec isn't deployed.
The destroy() method can be called from various places and is read by
me as the "we give up" error path. To accommodate for these unexpected
entrypoints I've added a single call to self.conn:shutdown() to prevent
the socket being put into blocking mode. I have no expectations that
there is any other use here. Same as previous, the self.conn.shutdown
check is there to make sure it's not called on unpatched luasec
deployments and self._tls is there to make sure we don't call shutdown()
on tcp sockets.
I wouldn't recommend logging of the conn:shutdown() error inside
close(), since a lot of clients simply close the connection before
SSL_shutdown() is done.

net.server_epoll: Don't try to flush buffer on closed connections

Tue, 19 Nov 2024 00:41:02 +0100

net.server_epoll: Don't try to flush buffer on closed connections

Attempt to fix a bug where connections are somehow closed twice, leading
to bad things happening elsewhere.

With LuaSec, closed connections are generally already too closed to
write anything to anyway since it does not support unidirectional
shutdown.

net.server_epoll: Revert opportunistic_writes tweak

Tue, 19 Nov 2024 00:31:21 +0100

net.server_epoll: Revert opportunistic_writes tweak

Added in f0b2c026e542 and not sure why

net.server_epoll: Make running out of buffer space a fatal error

Sat, 09 Nov 2024 15:42:31 +0100

net.server_epoll: Make running out of buffer space a fatal error

Prevent Bad Things from happening when the buffer gets full.
This of course opens up the possibility of intentionally killing
connections by sending much stuff, which need to be mitigated with rate
limits elsewhere.

net.server_epoll: Improve efficiency of sending much buffered data

Sat, 09 Nov 2024 00:37:15 +0100

net.server_epoll: Improve efficiency of sending much buffered data

Problem: The string slice operations when a lot of data gets buffered
ends up being expensive and memory-consuming. We have util.dbuffer for
precisely this kind of thing.

I want to keep the behavior of writebuffer being upgraded from nil to a
string to full buffer since the last step involves three table
allocations, where the previous buffer method only used one. Avoiding
those allocations for simple writes like white space keep alive feels
like it would keep memory churn down.

This work was started in 2020

net.server_epoll: Add support for systemd socket activation

Tue, 14 May 2024 17:07:47 +0200

net.server_epoll: Add support for systemd socket activation

Allows creating listening sockets and accepting client connections
before Prosody starts.
This is unlike normal Prosody dynamic resource management, where ports
may added and removed at any time, and the ports defined by the config.

Weird things happen if these are closed (e.g. due to reload) so here we
prevent closing and ensure sockets are reused when opened again.

net.server_epoll: Log creation of signalfd handles at noise level

Fri, 01 Mar 2024 19:20:45 +0100

net.server_epoll: Log creation of signalfd handles at noise level

To aid in tracking down signalfd-related problems

net.server_epoll: Log failure to hook signals

Wed, 28 Feb 2024 22:24:09 +0100

net.server_epoll: Log failure to hook signals

To make any such failures noticeable

util.signal: Wrap signalfd in an userdatum for gc handling etc

Sat, 24 Feb 2024 01:00:44 +0100

util.signal: Wrap signalfd in an userdatum for gc handling etc

net.server_epoll: Support hooking signals via signalfd

Sat, 24 Feb 2024 00:20:35 +0100

net.server_epoll: Support hooking signals via signalfd

Handling signal events the same way as all other events makes sense and
seems safer than the signal handling just jumping around in C and
messing with Lua states.

net.server_epoll: Prevent traceback when checking TLS after connection gone

Sun, 21 Jan 2024 22:59:50 +0100

net.server_epoll: Prevent traceback when checking TLS after connection gone

Unclear why this would be done, but an error is not great.

net.server_epoll: Avoid call to update socket watch flags when nothing changed

Tue, 21 Nov 2023 22:06:28 +0100

net.server_epoll: Avoid call to update socket watch flags when nothing changed

Should skip a syscall for each write when using epoll.

net: Prefix module imports with prosody namespace

Fri, 17 Mar 2023 16:23:12 +0100

net: Prefix module imports with prosody namespace

net.server_epoll: Remove delay on last main loop iteration when quitting

Fri, 06 Jan 2023 04:38:39 +0100

net.server_epoll: Remove delay on last main loop iteration when quitting

Main difference is that timers are not checked unconditionally before
each poll, only when running out of previous poll results (hidden by
util.poll). This removes a final poll at shutdown that usually delays
the 'not quitting' condition check by one second.

net.server_epoll: Factor out single main loop step into its own function

Fri, 06 Jan 2023 02:31:21 +0100

net.server_epoll: Factor out single main loop step into its own function

This isn't actually used in Prosody, so no value in complicating the
real main loop because of it

mod_saslauth: Implement RFC 9266 'tls-exporter' channel binding (#1760)

Wed, 01 Jun 2022 15:06:59 +0200

mod_saslauth: Implement RFC 9266 'tls-exporter' channel binding (#1760)

Brings back SCRAM-SHA-*-PLUS from its hiatus brought on by the earlier
channel binding method being undefined for TLS 1.3, and the increasing
deployment of TLS 1.3.

See 1bfd238e05ad and #1542

Requires future version of LuaSec, once support for this key material
export method is merged.

See https://github.com/brunoos/luasec/pull/187

net.server: Fix multiple return values

Fri, 03 Jun 2022 17:51:42 +0200

net.server: Fix multiple return values

return foo and foo() crops multiple return values to a single one, so
any second return values etc were last, mostly error details.

Introduced in 7e9ebdc75ce4

net.server_epoll: Add option to defer accept() until data available

Sun, 15 May 2022 22:41:17 +0200

net.server_epoll: Add option to defer accept() until data available

This is a Linux(?) socket option that delays the accept signal until
there is data available to read. E.g. with HTTP this might mean that a
whole request can be handled without going back trough another turn of
the main loop, and an initial client can be responded to.

This may have effects on latency and resource use, as the server does
not need to allocate resources until really needed.

net.server_epoll: Wrap LuaSocket object earlier to reuse option setting method

Fri, 16 Jul 2021 00:57:42 +0200

net.server_epoll: Wrap LuaSocket object earlier to reuse option setting method

Since it provides some protection and error handling in the form of
logging.

net.server_epoll: Move call to refresh remote IP address out of wrapper

Fri, 16 Jul 2021 00:56:45 +0200

net.server_epoll: Move call to refresh remote IP address out of wrapper

Reduces the side effects of wrapsocket()

net.server_epoll: Add support for TCP Fast Open

Thu, 08 Jul 2021 12:29:50 +0200

net.server_epoll: Add support for TCP Fast Open

Requires a patch to LuaSocket adding this socket option,
https://github.com/lunarmodules/luasocket/pull/378

sysctl tweaks
net.ipv4.tcp_fastopen=3
net.ipv4.tcp_fastopen_blackhole_timeout_sec = 0
net.ipv4.tcp_fastopen_key=$(
Disabled by default since it an advanced performance tweak unlikely to
be needed by most servers.

net: refactor sslconfig to not depend on LuaSec

Sat, 02 Apr 2022 11:15:33 +0200

net: refactor sslconfig to not depend on LuaSec

This now requires that the network backend exposes a tls_builder
function, which essentially wraps the former util.sslconfig.new()
function, passing a factory to create the eventual SSL context.

That allows a net.server backend to pick whatever it likes as SSL
context factory, as long as it understands the config table passed by
the SSL config builder. Heck, a backend could even mock and replace the
entire SSL config builder API.

net: isolate LuaSec-specifics

Wed, 27 Apr 2022 17:44:14 +0200

net: isolate LuaSec-specifics

For this, various accessor functions are now provided directly on the
sockets, which reach down into the LuaSec implementation to obtain the
information.

While this may seem of little gain at first, it hides the implementation
detail of the LuaSec+LuaSocket combination that the actual socket and
the TLS layer are separate objects.

The net gain here is that an alternative implementation does not have to
emulate that specific implementation detail and "only" has to expose
LuaSec-compatible data structures on the new functions.

net.server_epoll: Disable verbose mode by default

Sat, 12 Feb 2022 18:47:22 +0100

net.server_epoll: Disable verbose mode by default

util.id: Adjust entropy levels, with rationales

Thu, 02 Dec 2021 01:14:55 +0100

util.id: Adjust entropy levels, with rationales

Modules using ids for logging should not need the now pretty large
medium one.

Merge 0.11->trunk

Mon, 20 Dec 2021 23:12:08 +0100

Merge 0.11->trunk

net.server_epoll: Process all queued events from epoll before timers

Thu, 21 Oct 2021 15:59:16 +0200

net.server_epoll: Process all queued events from epoll before timers

Should call timers less frequently when many sockets are waiting for
processing. May help under heavy load.

Requested by Ge0rG

Backport of 2bcd84123eba requested by Roi

net.server_epoll: Ensure calls to :write() return something

Mon, 06 Dec 2021 10:59:14 +0100

net.server_epoll: Ensure calls to :write() return something

With opportunistic writes enabled, writes can return what :onwritable()
returns, thus :onwritable() should return something sensible at each
spot.

Should prevent whatever caused
> Error writing to connection: (nil)
Tho this was probably harmless

net.server_epoll: Prevent loop attempting to send last data after close

Tue, 30 Nov 2021 18:19:40 +0100

net.server_epoll: Prevent loop attempting to send last data after close

If the connection is closed by the peer, any buffered data is given a
last chance to be sent (see f27b9319e0da). If the connection is Really
closed, no attempt to write will occur, instead epoll will raise the
error flag and :onreadable() will be invoked again, where it will try to
:close() again for the same reason, thus looping until the connection
somehow gets destroyed.

By clearing the _connected flag, the second time it passes :onreadable()
it should go directly to :destroy(), breaking the loop.

Thanks Link Mauve for reporting

net.server_epoll: Fix streaming downloads (thanks Menel)

Fri, 19 Nov 2021 15:45:01 +0100

net.server_epoll: Fix streaming downloads (thanks Menel)

ff4e34c448a4 broke the way net.http.server streams downloads from disk
because it made writes from the ondrain callback no longer reset the
want-write flag, causing the download to halt.

Writes from the predrain handler still must not trigger anything but
additions to the buffer, since it is about to do all the socket writing
already.

net.server_epoll: Try harder to avoid reentrant opportunistic writes

Thu, 18 Nov 2021 16:21:43 +0100

net.server_epoll: Try harder to avoid reentrant opportunistic writes

Opportunistic writes sure do complicate things. This is especially
intended to avoid opportunistic_writes from within the onpredrain
callback.

net.server_epoll: Process all queued events from epoll before timers

Thu, 21 Oct 2021 15:59:16 +0200

net.server_epoll: Process all queued events from epoll before timers

Should call timers less frequently when many sockets are waiting for
processing. May help under heavy load.

Requested by Ge0rG

net.server_epoll: Prevent starttls on direct TLS connections

Tue, 05 Oct 2021 19:56:36 +0200

net.server_epoll: Prevent starttls on direct TLS connections

This is not a pretty way to signal this... but it is the current API

interface:inittls() is a new code path which did not go past the point
in interface:starttls() where it set starttls to false, leading mod_tls
to offer starttls on direct TLS connections

Thanks Martin for discovering.

net.server_epoll: Separate handling of "closed" from other errors

Wed, 22 Sep 2021 13:29:47 +0200

net.server_epoll: Separate handling of "closed" from other errors

The intent is to ensure 'ondisconnect' only gets called once, while
giving buffered outgoing data a last chance to be delivered via the
:close() path in case the connection was only shutdown in one direction.

net.server_epoll: Skip attempt to flush write buffer when not connected

Wed, 22 Sep 2021 11:27:55 +0200

net.server_epoll: Skip attempt to flush write buffer when not connected

Before 22825cb5dcd8 connection attempts that failed (e.g. connection
refused) would be immediately destroyed. After, it would schedule
another write cycle and then report 'ondisconnect' again when failing.

Thanks Martin for reporting

Merge 0.11->trunk

Mon, 20 Sep 2021 15:51:43 +0200

Merge 0.11->trunk

net.server_epoll: Add a hard deadline on shutdown to extra-fix #1670

Mon, 20 Sep 2021 14:38:08 +0200

net.server_epoll: Add a hard deadline on shutdown to extra-fix #1670

Should ensure shutdown even if sockets somehow take a very long to get closed.

net.server_epoll: Close sockets added after shutdown signal (fixes #1670)

Mon, 20 Sep 2021 14:42:18 +0200

net.server_epoll: Close sockets added after shutdown signal (fixes #1670)

This should ensure that sockets get closed even if they are added after
the quit signal. Otherwise they may keep the server alive.

net.server_epoll: Fix indentation messed up in last merge

Fri, 17 Sep 2021 12:42:04 +0200

net.server_epoll: Fix indentation messed up in last merge

Seems to have happened in 6427e2642976, probably because of Meld

net.server_epoll: Don't immediately destroy upon getting closed on read

Wed, 15 Sep 2021 18:39:37 +0200

net.server_epoll: Don't immediately destroy upon getting closed on read

Instead try to write any remaining buffered data. If the write attempt
also fails with "closed" then there's nothing we can do and the socket
is gone.

This reverts what appears to be a mistakenly included part of c8aa66595072

Thanks jonas’ for noticing

net.server_epoll: Try to make port number related methods sane

Sun, 12 Sep 2021 15:47:06 +0200

net.server_epoll: Try to make port number related methods sane

Previously it was unclear whether "client port" was the port that the
client connected to, or from. I hereby declare that the client port is
the source port and the server port is the destination port.

Incoming and outgoing connections can be distinguished by looking at
the_server reference, which only incoming connections have.

net.server_epoll: Prevent removed timers from being readded

Tue, 31 Aug 2021 13:34:08 +0200

net.server_epoll: Prevent removed timers from being readded

In a case like this the timer would not be readded:

addtimer(1, function(t, id)
stop(id)
return 1
end);

Merge 0.11->trunk

Tue, 31 Aug 2021 13:03:44 +0200

Merge 0.11->trunk

net.server_epoll: Fix to preserve ids of readded timers

Tue, 31 Aug 2021 12:58:38 +0200

net.server_epoll: Fix to preserve ids of readded timers

Likely affected rescheduling but have no reports of this.

After readding a timer, it would have been issued a new id. Rescheduling
would use the previous id, thus not working.

net.server_epoll: Split, attempt to clarify dirty noise message

Mon, 16 Aug 2021 20:15:38 +0200

net.server_epoll: Split, attempt to clarify dirty noise message

Only relevant because a "dirty" connection (with incoming data in
LuaSocket's buffer) does not count as "readable" according to epoll, so
special care needs to be taken to keep on processing it.

net.server: Add a predrain callaback just before writes

Mon, 16 Aug 2021 12:34:52 +0200

net.server: Add a predrain callaback just before writes

Allows sneaking in things in the write buffer just before it's sent to
the network stack. For example ack requests, compression flushes or
other things that make sense to send after stanzas or other things.
This ensures any additional trailing data sent is included in the same
write, and possibly the same TCP packet. Other methods used such as
timers or nextTick might not have the same effect as it depends on
scheduling.

net.server_epoll: Improve efficiency of opportunistic writes

Sat, 14 Aug 2021 13:07:29 +0200

net.server_epoll: Improve efficiency of opportunistic writes

Should prevent further opportunistic write attempts after the kernel
buffers are full and stops accepting writes.

When combined with `keep_buffers = false` it should stop it from
repeatedly recreating the buffer table and concatenating it back into a
string when there's a lot to write.

net.server_epoll: Fix traceback-causing typo

Sun, 18 Jul 2021 08:53:37 +0200

net.server_epoll: Fix traceback-causing typo

Caused "attempt to index a string value (local 'data')", but only if
keep_buffers is set to false, which is not the default.

Introduced in 917eca7be82b

net.server_epoll: Ensure timeouts match epoll flags

Sat, 17 Jul 2021 14:54:48 +0200

net.server_epoll: Ensure timeouts match epoll flags

Read and write timeouts should usually match whether we want to read or
write.

net.server_epoll: Skip reset of read timeout when not reading

Sat, 17 Jul 2021 14:51:50 +0200

net.server_epoll: Skip reset of read timeout when not reading

Should avoid rare but needless timer interactions

net.server_epoll: Reduce timer churn during TLS handshake

Sat, 17 Jul 2021 14:06:57 +0200

net.server_epoll: Reduce timer churn during TLS handshake

Instead of removing and readding the timer, keep it and adjust it
instead. Should reduce garbage production a bit.