# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1678027544 -3600
# Node ID ae0fba27fc2459a414071b1b6a956c9b37e600e2
# Parent  aaf055d6fe7a73923f50afd1bd8b270e03408540# Parent  419e55abd28590d2b3eeb0cfa8944205a1e01dcd
Merge 0.12->trunk

diff -r aaf055d6fe7a -r ae0fba27fc24 plugins/mod_http.lua
--- a/plugins/mod_http.lua	Sun Mar 05 14:08:26 2023 +0100
+++ b/plugins/mod_http.lua	Sun Mar 05 15:45:44 2023 +0100
@@ -261,7 +261,9 @@
 		apps[event.item.name] = nil;
 		for event_name, handlers in pairs(app_handlers) do
 			module:unhook_object_event(server, event_name, handlers.main);
-			module:unhook_object_event(server, event_name, handlers.cors);
+			if handlers.cors then
+				module:unhook_object_event(server, event_name, handlers.cors);
+			end
 
 			if event_name:sub(-2, -1) == "/*" then
 				module:unhook_object_event(server, event_name:sub(1, -3), redir_handler, -1);
@@ -269,8 +271,10 @@
 				module:unhook_object_event(server, event_name:sub(1, -2), redir_handler, -1);
 			end
 
-			local options_event_name = event_name:gsub("^%S+", "OPTIONS");
-			module:unhook_object_event(server, options_event_name, handlers.options);
+			if handlers.options then
+				local options_event_name = event_name:gsub("^%S+", "OPTIONS");
+				module:unhook_object_event(server, options_event_name, handlers.options);
+			end
 		end
 	end