mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2020-04-26 20:49:31 +02:00
commit 9bc378f662
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/http/files.lua
View file

@ -80,7 +80,7 @@ local function serve(opts)
local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification); local last_modified = os_date('!%a, %d %b %Y %H:%M:%S GMT', attr.modification);
response_headers.last_modified = last_modified; 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; response_headers.etag = etag;
local if_none_match = request_headers.if_none_match local if_none_match = request_headers.if_none_match

2
plugins/mod_carbons.lua
View file

@ -69,7 +69,7 @@ local function message_handler(event, c2s)
elseif stanza:get_child("no-copy", "urn:xmpp:hints") then elseif stanza:get_child("no-copy", "urn:xmpp:hints") then
module:log("debug", "Message has no-copy hint, ignoring"); module:log("debug", "Message has no-copy hint, ignoring");
return 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"); module:log("debug", "MUC PM, ignoring");
return return
end end