From: Petr Špaček <petr.spacek@nic.cz>
Date: Mon, 15 Apr 2019 13:01:23 +0000 (+0200)
Subject: http: remember server config in http.servers table
X-Git-Tag: v4.0.0~4^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45e1e7cb7b34b5193a63de337c3731a01e2c78ee;p=thirdparty%2Fknot-resolver.git

http: remember server config in http.servers table
---

diff --git a/modules/http/http.lua.in b/modules/http/http.lua.in
index a1e8486c6..2ba4ff9bf 100644
--- a/modules/http/http.lua.in
+++ b/modules/http/http.lua.in
@@ -366,7 +366,7 @@ function M.add_interface(conf)
 	if err then
 		panic('failed to listen on %s: %s', addr_str, err)
 	end
-	table.insert(M.servers, s)
+	table.insert(M.servers, {server = s, config = conf})
 	-- Create certificate renewal timer if ephemeral
 	if crt and ephemeral then
 		local _, expiry = crt:getLifetime()
@@ -401,7 +401,7 @@ end
 -- @function Cleanup module
 function M.deinit()
 	for i, server in ipairs(M.servers) do
-		server:close()
+		server.server:close()
 		M.servers[i] = nil
 	end
 	prometheus.deinit()
diff --git a/modules/http/http.test.lua b/modules/http/http.test.lua
index 8d987597e..b05f5a506 100644
--- a/modules/http/http.test.lua
+++ b/modules/http/http.test.lua
@@ -14,12 +14,12 @@ else
 	modules = {
 		http = {
 			port = 0, -- Select random port
-			cert = false,
+			tls = false,
 			endpoints = endpoints,
 		}
 	}
 
-	local server = http.servers[1]
+	local server = http.servers[1].server
 	ok(server ~= nil, 'creates server instance')
 	local _, host, port = server:localname()
 	ok(host and port, 'binds to an interface')