Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.11->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 15 Sep 2020 09:09:06 +0100
changeset 11072 988ddd57e851
parent 11070 dc41c8dfd2b1 (current diff)
parent 11071 f2ffc16a9669 (diff)
child 11073 770a5923e959
Merge 0.11->trunk
net/http.lua file | annotate | diff | comparison | revisions
net/server_epoll.lua file | annotate | diff | comparison | revisions
net/server_event.lua file | annotate | diff | comparison | revisions
net/server_select.lua file | annotate | diff | comparison | revisions 
--- 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
--- 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;
+	};
 };
prosody