# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1562546672 -7200
# Node ID 5c71693c83458db71ffbff3c631c7368c12c1960
# Parent  7a36b7ac309bbca74ad75edd9cf86db33535ba7d# Parent  08c6540f5a65e60564c3d38482e9e561767cc443
Merge 0.11->trunk

diff -r 08c6540f5a65 -r 5c71693c8345 net/http/files.lua
diff -r 08c6540f5a65 -r 5c71693c8345 net/server_epoll.lua
diff -r 08c6540f5a65 -r 5c71693c8345 util/serialization.lua
--- a/util/serialization.lua	Thu Jun 20 22:26:46 2019 +0200
+++ b/util/serialization.lua	Mon Jul 08 02:44:32 2019 +0200
@@ -267,10 +267,15 @@
 	return ret;
 end
 
+local default = new();
 return {
 	new = new;
 	serialize = function (x, opt)
-		return new(opt)(x);
+		if opt == nil then
+			return default(x);
+		else
+			return new(opt)(x);
+		end
 	end;
 	deserialize = deserialize;
 };