diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-04-22 12:24:42 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-04-22 12:24:42 +0100 |
commit | 61f88df5421eb95fc1f9c5febc89556fac9b6978 (patch) | |
tree | a3ceaf9ce849b643d85d0c0b600755225e07df55 | |
parent | 81216b737e5ca2e73061b10935b45f7d9dd7b09f (diff) | |
download | prosody-61f88df5421eb95fc1f9c5febc89556fac9b6978.tar.gz prosody-61f88df5421eb95fc1f9c5febc89556fac9b6978.zip |
net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries)
-rw-r--r-- | net/http/server.lua | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/http/server.lua b/net/http/server.lua index a983b8d5..3c2b55d5 100644 --- a/net/http/server.lua +++ b/net/http/server.lua @@ -27,6 +27,8 @@ local function is_wildcard_match(wildcard_event, event) 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 @@ setmetatable(events._handlers, { 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) |