util.json: Fix variable name typo which broke util.json when util.array was missing.

[prosody.git] / plugins / mod_http.lua

diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index e73778ae630f9c4091dcec1410efbed34ac0d45d..0689634ec704a0f08848b75d95fed076f852c96b 100644 (file)
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -9,6 +9,7 @@
 module:set_global();
 module:depends("http_errors");
 
+local portmanager = require "core.portmanager";
 local moduleapi = require "core.moduleapi";
 local url_parse = require "socket.url".parse;
 local url_build = require "socket.url".build;
@@ -38,9 +39,10 @@ local function get_http_event(host, app_path, key)
 end
 
 local function get_base_path(host_module, app_name, default_app_path)
-       return normalize_path(host_module:get_option("http_paths", {})[app_name] -- Host
+       return (normalize_path(host_module:get_option("http_paths", {})[app_name] -- Host
                or module:get_option("http_paths", {})[app_name] -- Global
-               or default_app_path); -- Default
+               or default_app_path)) -- Default
+               :gsub("%$(%w+)", { host = module.host });
 end
 
 local ports_by_scheme = { http = 80, https = 443, };
@@ -88,7 +90,7 @@ function module.add_host(module)
                                        local data = handler;
                                        handler = function () return data; end
                                elseif event_name:sub(-2, -1) == "/*" then
-                                       local base_path_len = #event_name:match("(/.+/)%*$")+1;
+                                       local base_path_len = #event_name:match("/.+$");
                                        local _handler = handler;
                                        handler = function (event)
                                                local path = event.request.path:sub(base_path_len);
@@ -137,6 +139,7 @@ module:provides("net", {
        listener = server.listener;
        default_port = 5281;
        encryption = "ssl";
+       ssl_config = { verify = "none" };
        multiplex = {
                pattern = "^[A-Z]";
        };