modules/http: allow passing server options to http configuration

This allows HTTP server to start with reuseport, reuseaddr or v6only.
The reuseport allows running HTTP module on all forks, not just the main one.

diff --git a/modules/http/http.lua b/modules/http/http.lua
index c0df9400416160a444d848d25c5ab6bd7178180f..e4baf8fdde5cfd38aa114a5afd5723eefebd5074 100644 (file)
--- a/modules/http/http.lua
+++ b/modules/http/http.lua
@@ -391,12 +391,7 @@ function M.config(conf)
                end
        end
 
-       -- Add endpoints to default endpoints
-       local endpoints = conf.endpoints or {}
-       for k, v in pairs(M.endpoints) do
-               endpoints[k] = v
-       end
-       M.interface(conf.host, conf.port, endpoints, conf.cert, conf.key)
+       M.add_interface(conf)
 end
 
 return M

diff --git a/modules/http/http.test.lua b/modules/http/http.test.lua
index 198dd0abf2417024ec390c983131469df8d57721..e22024b9be7e068378d6c125d6c35e4dd6b0a521 100644 (file)
--- a/modules/http/http.test.lua
+++ b/modules/http/http.test.lua
@@ -5,13 +5,17 @@ if not has_http then
        done()
 else
        local request = require('http.request')
+       local endpoints = require('http').endpoints
+
+       -- custom endpoints
+       endpoints['/test'] = {'text/custom', function () return 'hello' end}
 
        -- setup resolver
        modules = {
                http = {
                        port = 0, -- Select random port
                        cert = false,
-                       endpoints = { ['/test'] = {'text/custom', function () return 'hello' end} },
+                       endpoints = endpoints,
                }
        }