mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 14:47:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-03-16 23:49:27 +01:00
commit 3e5d5895f9
10 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/mod_admin_telnet.lua
View file

@ -1148,7 +1148,7 @@ function def_env.http:list()
for host in pairs(prosody.hosts) do
local http_apps = modulemanager.get_items("http-provider", host);
if #http_apps > 0 then
local http_host = module:context(host):get_option("http_host");
local http_host = module:context(host):get_option_string("http_host");
print("HTTP endpoints on "..host..(http_host and (" (using "..http_host.."):") or ":"));
for _, provider in ipairs(http_apps) do
local url = module:context(host):http_url(provider.name);
@ -1158,7 +1158,7 @@ function def_env.http:list()
end
end
local default_host = module:get_option("http_default_host");
local default_host = module:get_option_string("http_default_host");
if not default_host then
print("HTTP requests to unknown hosts will return 404 Not Found");
else