diff options
| author | Matthew Wild <mwild1@gmail.com> | 2018-04-24 22:59:41 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2018-04-24 22:59:41 +0100 |
| commit | 280eda897986aea9e7fe0fa4fb53f9130681b58b (patch) | |
| tree | 32738193f40c5114889c72612fe0dfbffa325d38 | |
| parent | aebd5479d216cf4e122911fc7b10d2f4b88cc533 (diff) | |
| parent | 9a76ea7e31d5034607932ac304d89c40bf9c59bf (diff) | |
| download | prosody-280eda897986aea9e7fe0fa4fb53f9130681b58b.tar.gz prosody-280eda897986aea9e7fe0fa4fb53f9130681b58b.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_http_files.lua | 2 | ||||
| -rw-r--r-- | util/events.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_http_files.lua b/plugins/mod_http_files.lua index e477bafe..c5986e37 100644 --- a/plugins/mod_http_files.lua +++ b/plugins/mod_http_files.lua @@ -144,7 +144,7 @@ function serve(opts) if not data then return 403; end - cache[orig_path] = { data = data, content_type = mime_map.html; etag = etag; }; + cache:set(orig_path, { data = data, content_type = mime_map.html; etag = etag; }); response_headers.content_type = mime_map.html; else diff --git a/util/events.lua b/util/events.lua index 78700d65..0bf0ddcb 100644 --- a/util/events.lua +++ b/util/events.lua @@ -127,7 +127,7 @@ local function new() w = wrappers[event_name]; end if not w then return; end - for i = #w, 1 do + for i = #w, 1, -1 do if w[i] == wrapper then t_remove(w, i); end |