Changeset

5506:69ee5b10738d

net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries)
author Matthew Wild <mwild1@gmail.com>
date Mon, 22 Apr 2013 12:24:42 +0100
parents 5502:c773aa4467f1
children 5507:3a876f02934a
files net/http/server.lua
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/net/http/server.lua	Mon Apr 22 11:54:15 2013 -0400
+++ b/net/http/server.lua	Mon Apr 22 12:24:42 2013 +0100
@@ -27,6 +27,8 @@
 	return wildcard_event:sub(1, -2) == event:sub(1, #wildcard_event-1);
 end
 
+local recent_wildcard_events, max_cached_wildcard_events = {}, 10000;
+
 local event_map = events._event_map;
 setmetatable(events._handlers, {
 	__index = function (handlers, curr_event)
@@ -58,6 +60,12 @@
 			handlers_array = false;
 		end
 		rawset(handlers, curr_event, handlers_array);
+		if not event_map[curr_event] then -- Only wildcard handlers match, if any
+			table.insert(recent_wildcard_events, curr_event);
+			if #recent_wildcard_events > max_cached_wildcard_events then
+				rawset(handlers, table.remove(recent_wildcard_events, 1), nil);
+			end
+		end
 		return handlers_array;
 	end;
 	__newindex = function (handlers, curr_event, handlers_array)