# HG changeset patch # User Matthew Wild # Date 1353006473 18000 # Node ID 9b93b0698d7e3ccdefa68bb93513cd3a9182de5f # Parent fa6d61f2fe206cf4deeecba3cdf4b0d750b209bd# Parent 1e9508ae44cc8de0a4594d5f313e54b72c48a89a Merge 0.9->trunk diff -r fa6d61f2fe20 -r 9b93b0698d7e plugins/mod_bosh.lua --- a/plugins/mod_bosh.lua Sun Nov 11 23:48:38 2012 +0100 +++ b/plugins/mod_bosh.lua Thu Nov 15 14:07:53 2012 -0500 @@ -70,8 +70,8 @@ local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat; local os_time = os.time; -local sessions = {}; -local inactive_sessions = {}; -- Sessions which have no open requests +-- All sessions, and sessions that have no requests open +local sessions, inactive_sessions = module:shared("sessions", "inactive_sessions"); -- Used to respond to idle sessions (those with waiting requests) local waiting_requests = {}; diff -r fa6d61f2fe20 -r 9b93b0698d7e plugins/mod_http.lua --- a/plugins/mod_http.lua Sun Nov 11 23:48:38 2012 +0100 +++ b/plugins/mod_http.lua Thu Nov 15 14:07:53 2012 -0500 @@ -67,7 +67,7 @@ end function module.add_host(module) - local host = module.host; + local host = module:get_option_string("http_host", module.host); local apps = {}; module.environment.apps = apps; local function http_app_added(event) diff -r fa6d61f2fe20 -r 9b93b0698d7e util/pubsub.lua --- a/util/pubsub.lua Sun Nov 11 23:48:38 2012 +0100 +++ b/util/pubsub.lua Thu Nov 15 14:07:53 2012 -0500 @@ -244,6 +244,7 @@ node_obj = self.nodes[node]; end node_obj.data[id] = item; + self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item }); self.config.broadcaster(node, node_obj.subscribers, item); return true; end