# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1524607181 -3600
# Node ID 9e839fb4541a931b4f28c229e28949d4d34afc16
# Parent  2db9c9e3adc170e358ef4781ac8c9eb07f33e901# Parent  c380a22d52d5be54a325802c9a2de241dd2d12a1
Merge 0.10->trunk

diff -r 2db9c9e3adc1 -r 9e839fb4541a plugins/mod_http_files.lua
--- a/plugins/mod_http_files.lua	Wed Apr 18 08:49:44 2018 +0100
+++ b/plugins/mod_http_files.lua	Tue Apr 24 22:59:41 2018 +0100
@@ -144,7 +144,7 @@
 			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 -r 2db9c9e3adc1 -r 9e839fb4541a util/events.lua
--- a/util/events.lua	Wed Apr 18 08:49:44 2018 +0100
+++ b/util/events.lua	Tue Apr 24 22:59:41 2018 +0100
@@ -127,7 +127,7 @@
 			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