# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1600157346 -3600
# Node ID 988ddd57e851d175444dd893788fb894d737ef25
# Parent  dc41c8dfd2b1d9b3f7156fd781b1e567d622fd62# Parent  f2ffc16a96690c76b97c06a2336d3afdfd0fea6c
Merge 0.11->trunk

diff -r dc41c8dfd2b1 -r 988ddd57e851 .hgtags
--- a/.hgtags	Fri Sep 11 12:37:07 2020 +0100
+++ b/.hgtags	Tue Sep 15 09:09:06 2020 +0100
@@ -72,3 +72,4 @@
 dd7e924c74ef27b7f92eb872d2db50aaa229b234 0.11.3
 10d6d0d91f4ec47a6eb446792fee1d4b79a914d7 0.11.4
 dbd60f47316492bc367802914dc8fa47f4b3edac 0.11.5
+bacca65ce107b8549ce5f9079e81e5771eed2021 0.11.6
diff -r dc41c8dfd2b1 -r 988ddd57e851 net/http.lua
--- a/net/http.lua	Fri Sep 11 12:37:07 2020 +0100
+++ b/net/http.lua	Tue Sep 15 09:09:06 2020 +0100
@@ -331,4 +331,7 @@
 	formencode = util_http.formencode;
 	formdecode = util_http.formdecode;
 	destroy_request = destroy_request;
+	features = {
+		sni = true;
+	};
 };
diff -r dc41c8dfd2b1 -r 988ddd57e851 net/server_epoll.lua
diff -r dc41c8dfd2b1 -r 988ddd57e851 net/server_event.lua
diff -r dc41c8dfd2b1 -r 988ddd57e851 net/server_select.lua