diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-12-03 14:59:55 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-12-03 14:59:55 +0000 |
commit | 5656b525d3b72b09964fe9fbc2b70ceda54ab66b (patch) | |
tree | 0a45f803690602626615b39fd3c0b17e3df266e7 /net/http | |
parent | 630248084188d2bbc01da354ec022db6b18aebc7 (diff) | |
parent | cf88b880cd19bd21161f6b3e8688fb752a96f64d (diff) | |
download | prosody-5656b525d3b72b09964fe9fbc2b70ceda54ab66b.tar.gz prosody-5656b525d3b72b09964fe9fbc2b70ceda54ab66b.zip |
Merge 0.10->trunk
Diffstat (limited to 'net/http')
-rw-r--r-- | net/http/server.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/http/server.lua b/net/http/server.lua index ffcceabe..acfb8a1d 100644 --- a/net/http/server.lua +++ b/net/http/server.lua @@ -27,7 +27,10 @@ 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 _handlers = events._handlers; +local recent_wildcard_events = cache.new(10000, function (key, value) + rawset(_handlers, key, nil); +end); local event_map = events._event_map; setmetatable(events._handlers, { @@ -62,10 +65,7 @@ setmetatable(events._handlers, { 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 + recent_wildcard_events:set(curr_event, true); end return handlers_array; end; |