diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-26 22:21:55 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-26 22:21:55 +0100 |
| commit | 42c4183e34f2a15920d3df042eed5531b552c495 (patch) | |
| tree | ace5cad832311d8026958763adde400641650098 | |
| parent | 0213c9ded3d5be56806a5e9e528f61bc37331997 (diff) | |
| parent | 4ee0ced8eb75a28f30744f18694ca1fab670bea0 (diff) | |
| download | prosody-42c4183e34f2a15920d3df042eed5531b552c495.tar.gz prosody-42c4183e34f2a15920d3df042eed5531b552c495.zip | |
Merge 0.9->0.10
| -rw-r--r-- | plugins/mod_auth_anonymous.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_http.lua | 5 | ||||
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua index c877d532..8de46f8c 100644 --- a/plugins/mod_auth_anonymous.lua +++ b/plugins/mod_auth_anonymous.lua @@ -43,7 +43,7 @@ function provider.get_sasl_handler() end function provider.users() - return next, hosts[host].sessions, nil; + return next, hosts[module.host].sessions, nil; end -- datamanager callback to disable writes diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua index 95933da5..d987ef74 100644 --- a/plugins/mod_http.lua +++ b/plugins/mod_http.lua @@ -42,7 +42,7 @@ local function get_base_path(host_module, app_name, default_app_path) 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 - :gsub("%$(%w+)", { host = module.host }); + :gsub("%$(%w+)", { host = host_module.host }); end local ports_by_scheme = { http = 80, https = 443, }; @@ -51,6 +51,9 @@ local ports_by_scheme = { http = 80, https = 443, }; function moduleapi.http_url(module, app_name, default_path) app_name = app_name or (module.name:gsub("^http_", "")); local external_url = url_parse(module:get_option_string("http_external_url")) or {}; + if external_url.scheme and external_url.port == nil then + external_url.port = ports_by_scheme[external_url.scheme]; + end local services = portmanager.get_active_services(); local http_services = services:get("https") or services:get("http") or {}; for interface, ports in pairs(http_services) do diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index e9dbd2dc..66bf4f93 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -44,8 +44,10 @@ function build_stanza(tuple, stanza) for _, a in ipairs(tuple[4]) do build_stanza(a, stanza); end if up then stanza:up(); else return stanza end elseif tuple[1] == "xmlcdata" then - assert(type(tuple[2]) == "string", "XML CDATA has unexpected type: "..type(tuple[2])); - stanza:text(tuple[2]); + if type(tuple[2]) ~= "table" then + assert(type(tuple[2]) == "string", "XML CDATA has unexpected type: "..type(tuple[2])); + stanza:text(tuple[2]); + end -- else it's [], i.e., the null value, used for the empty string else error("unknown element type: "..serialize(tuple)); end |