Diff

plugins/mod_admin_telnet.lua @ 7982:e30b0cbed472

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 16 Mar 2017 23:49:27 +0100
parent 7923:81f3068fc30c
parent 7977:01d6298de991
child 8128:c14513401d65
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua	Sun Mar 12 12:52:55 2017 +0100
+++ b/plugins/mod_admin_telnet.lua	Thu Mar 16 23:49:27 2017 +0100
@@ -1148,7 +1148,7 @@
 	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 @@
 		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