changeset 13934:bf5c2dc0a955

Merge 13.0->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 24 Aug 2025 20:05:36 +0200
parents fddc45e46335 (current diff) dae094b392d1 (diff)
children 6a493e41c2cc
files
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/net/server_epoll.lua	Fri Aug 08 15:09:52 2025 +0200
+++ b/net/server_epoll.lua	Sun Aug 24 20:05:36 2025 +0200
@@ -966,6 +966,8 @@
 		if self.conn and self.conn:dirty() then
 			self:noise("Have buffered incoming data to process");
 			self:onreadable();
+		else
+			self:setreadtimeout();
 		end
 	end);
 end
--- a/net/server_event.lua	Fri Aug 08 15:09:52 2025 +0200
+++ b/net/server_event.lua	Sun Aug 24 20:05:36 2025 +0200
@@ -304,6 +304,14 @@
 	return sock:getpeerfinished();
 end
 
+function interface_mt:ssl_exportkeyingmaterial(label, len, context)
+	local sock = self.conn;
+	if not sock then return nil, "not-connected" end
+	if sock.exportkeyingmaterial then
+		return sock:exportkeyingmaterial(label, len, context);
+	end
+end
+
 function interface_mt:resume()
 	self:_lock(self.nointerface, false, self.nowriting);
 	if self.readcallback and not self.eventread then