Changeset

5182:9b93b0698d7e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 15 Nov 2012 14:07:53 -0500
parents 5178:fa6d61f2fe20 (current diff) 5181:1e9508ae44cc (diff)
children 5184:e71cf524893c
files
diffstat 3 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 = {};
--- 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)
--- 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