aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_websocket.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-05-17 01:06:20 +0200
committerKim Alvefur <zash@zash.se>2017-05-17 01:06:20 +0200
commit9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7 (patch)
tree87920ea2589baddc568772aeebb1fda17b5c9e0c /plugins/mod_websocket.lua
parentd300932f7b75b891e6dfcf7d568d796c227b9502 (diff)
parent8c3f6bd236ef6addc1dda80d42d6fd73acc4e1f5 (diff)
downloadprosody-9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7.tar.gz
prosody-9cca72b5892f44ef7bd118c1ca3cf5f4f441c9f7.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_websocket.lua')
-rw-r--r--plugins/mod_websocket.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua
index d545e708..ed73962d 100644
--- a/plugins/mod_websocket.lua
+++ b/plugins/mod_websocket.lua
@@ -334,7 +334,7 @@ function module.add_host(module)
-- This might be weird with random load order
local_cross_domain:exclude(cross_domain);
cross_domain:include(local_cross_domain);
- module:log("debug", "cross_domain = %s", cross_domain);
+ module:log("debug", "cross_domain = %s", tostring(cross_domain));
function module.unload()
cross_domain:exclude(local_cross_domain);
end