Comparison

plugins/mod_websocket.lua @ 8060:71bdfdf6565d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 04 Apr 2017 01:41:09 +0200
parent 8052:f83a2d4826fb
child 8145:4d0f5ea19851
comparison
equal deleted inserted replaced
8051:b2681397bafa 8060:71bdfdf6565d
332 local local_cross_domain = module:get_option_set("cross_domain_websocket", { this_origin }); 332 local local_cross_domain = module:get_option_set("cross_domain_websocket", { this_origin });
333 -- Don't add / remove something added by another host 333 -- Don't add / remove something added by another host
334 -- This might be weird with random load order 334 -- This might be weird with random load order
335 local_cross_domain:exclude(cross_domain); 335 local_cross_domain:exclude(cross_domain);
336 cross_domain:include(local_cross_domain); 336 cross_domain:include(local_cross_domain);
337 module:log("debug", "cross_domain = %s", cross_domain);
337 function module.unload() 338 function module.unload()
338 cross_domain:exclude(local_cross_domain); 339 cross_domain:exclude(local_cross_domain);
339 end 340 end
340 end 341 end
341 end 342 end