# HG changeset patch # User Kim Alvefur # Date 1480937031 -3600 # Node ID d6b96e42e8e61fabbb22c1d10ca2c6df592a81c1 # Parent c5ce14539fc4071a3469638a4a3380b1c7deeb5d mod_websocket: Allow per-host cross_domain_websocket, defaulting to the base URL of the current host diff -r c5ce14539fc4 -r d6b96e42e8e6 plugins/mod_websocket.lua --- a/plugins/mod_websocket.lua Mon Dec 05 12:23:41 2016 +0100 +++ b/plugins/mod_websocket.lua Mon Dec 05 12:23:51 2016 +0100 @@ -323,9 +323,13 @@ -- The 'Origin' consists of the base URL without path url_components.path = nil; local this_origin = url.build(url_components); - cross_domain:add(this_origin); + local local_cross_domain = module:get_option_set("cross_domain_websocket", { this_origin }); + -- Don't add / remove something added by another host + -- This might be weird with random load order + local_cross_domain:exclude(cross_domain); + cross_domain:include(local_cross_domain); function module.unload() - cross_domain:remove(this_origin); + cross_domain:exclude(local_cross_domain); end end end