Merge 0.11->trunk

1 files changed, 18 insertions, 0 deletions

diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index 610a0fbf..90d3929f 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -89,6 +89,9 @@ local default_config = { __index = {
 
 	-- Reuse write buffer tables
 	keep_buffers = true;
+
+	--- How long to wait after getting the shutdown signal before forcefully tearing down every socket
+	shutdown_deadline = 5;
 }};
 local cfg = default_config.__index;
 
@@ -1004,6 +1007,21 @@ local function setquitting(quit)
 	if quit then
 		quitting = "quitting";
 		closeall();
+		addtimer(1, function ()
+			if quitting then
+				closeall();
+				return 1;
+			end
+		end);
+		if cfg.shutdown_deadline then
+			addtimer(cfg.shutdown_deadline, function ()
+				if quitting then
+					for fd, conn in pairs(fds) do -- luacheck: ignore 213/fd
+						conn:destroy();
+					end
+				end
+			end);
+		end
 	else
 		quitting = nil;
 	end