diff options
| author | Kim Alvefur <zash@zash.se> | 2020-04-26 20:49:31 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-04-26 20:49:31 +0200 |
| commit | 2b47df3f0169bbe988d4b12759b0903a70112afe (patch) | |
| tree | 501388924cc264d72216d97b404e2438b128b222 | |
| parent | 2853b3ac5db9ecefacbfd575924c8ba663b7e7c2 (diff) | |
| parent | 224351595ea39507511872d54c2469bdfd91652e (diff) | |
| download | prosody-2b47df3f0169bbe988d4b12759b0903a70112afe.tar.gz prosody-2b47df3f0169bbe988d4b12759b0903a70112afe.zip | |
Merge 0.11->trunk
| -rw-r--r-- | net/http/files.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_carbons.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/http/files.lua b/net/http/files.lua index 650c6f47..583f7514 100644 --- a/net/http/files.lua +++ b/net/http/files.lua @@ -80,7 +80,7 @@ local function serve(opts) 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 --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua index 0f8c7c60..5c17616c 100644 --- a/plugins/mod_carbons.lua +++ b/plugins/mod_carbons.lua @@ -69,7 +69,7 @@ local function message_handler(event, c2s) 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 |