Software / code / prosody
Changeset
10778:a62b981db0e2
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 26 Apr 2020 20:49:31 +0200 |
| parents | 10775:1641e33f1d36 (current diff) 10777:3695904d2854 (diff) |
| children | 10779:d95e083931d1 |
| files | net/http/files.lua plugins/mod_carbons.lua plugins/mod_http_files.lua |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
