# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1779795092 -3600
# Node ID 3b26b8772fb1630d3f099e0ee6196f1e62771c5a
# Parent  e58de351880f8edc29f06488885a1cfd8e7cb28e# Parent  303069346d109ea323c14108fe3d0487117cb9ae
Merge 13.0->trunk

diff -r e58de351880f -r 3b26b8772fb1 net/websocket.lua
--- a/net/websocket.lua	Tue May 26 11:47:33 2026 +0100
+++ b/net/websocket.lua	Tue May 26 12:31:32 2026 +0100
@@ -240,7 +240,7 @@
 		insecure = ex.insecure;
 	}, function(b, c, r, http_req)
 		if c ~= 101
-		   or r.headers["connection"]:lower() ~= "upgrade"
+		   or (r.headers["connection"] or ""):lower() ~= "upgrade"
 		   or r.headers["upgrade"] ~= "websocket"
 		   or r.headers["sec-websocket-accept"] ~= base64.encode(sha1(key .. "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"))
 		   or (protocol and not protocol[r.headers["sec-websocket-protocol"]])
diff -r e58de351880f -r 3b26b8772fb1 plugins/mod_account_activity.lua
diff -r e58de351880f -r 3b26b8772fb1 plugins/mod_storage_memory.lua
--- a/plugins/mod_storage_memory.lua	Tue May 26 11:47:33 2026 +0100
+++ b/plugins/mod_storage_memory.lua	Tue May 26 12:31:32 2026 +0100
@@ -206,7 +206,7 @@
 		item.when = new_when;
 	end
 	if new_with then
-		item.with = new_when;
+		item.with = new_with;
 	end
 	return true;
 end
diff -r e58de351880f -r 3b26b8772fb1 util/paths.lua
--- a/util/paths.lua	Tue May 26 11:47:33 2026 +0100
+++ b/util/paths.lua	Tue May 26 12:31:32 2026 +0100
@@ -62,7 +62,7 @@
 		package.path = package.path..lua_path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?.lua";
 		package.path = package.path..lua_path_sep..installer_plugin_path..dir_sep.."share"..sub_path.."?"..dir_sep.."init.lua";
 	end
-	if not string.find(package.path, installer_plugin_path, 1, true) then
+	if not string.find(package.cpath, installer_plugin_path, 1, true) then
 		package.cpath = package.cpath..lua_path_sep..installer_plugin_path..dir_sep.."lib"..sub_path.."?.so";
 	end
 end