# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1587926971 -7200
# Node ID a62b981db0e297a668f7dcd16f8bb3618bebe387
# Parent  1641e33f1d3642a0cd42f5f52ef466e8e5484ace# Parent  3695904d2854d187538e405d49edd8f285969910
Merge 0.11->trunk

diff -r 1641e33f1d36 -r a62b981db0e2 net/http/files.lua
--- a/net/http/files.lua	Sun Apr 26 19:38:38 2020 +0200
+++ b/net/http/files.lua	Sun Apr 26 20:49:31 2020 +0200
@@ -80,7 +80,7 @@
 		local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification);
 		response_headers.last_modified = last_modified;
 
-		local etag = ('"%02x-%x-%x-%x"'):format(attr.dev or 0, attr.ino or 0, attr.size or 0, attr.modification or 0);
+		local etag = ('"%x-%x-%x"'):format(attr.change or 0, attr.size or 0, attr.modification or 0);
 		response_headers.etag = etag;
 
 		local if_none_match = request_headers.if_none_match
diff -r 1641e33f1d36 -r a62b981db0e2 plugins/mod_carbons.lua
--- a/plugins/mod_carbons.lua	Sun Apr 26 19:38:38 2020 +0200
+++ b/plugins/mod_carbons.lua	Sun Apr 26 20:49:31 2020 +0200
@@ -69,7 +69,7 @@
 	elseif stanza:get_child("no-copy", "urn:xmpp:hints") then
 		module:log("debug", "Message has no-copy hint, ignoring");
 		return
-	elseif not c2s and bare_jid == orig_from and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then
+	elseif not c2s and bare_jid ~= orig_to and stanza:get_child("x", "http://jabber.org/protocol/muc#user") then
 		module:log("debug", "MUC PM, ignoring");
 		return
 	end
diff -r 1641e33f1d36 -r a62b981db0e2 plugins/mod_http_files.lua