prosody
06ba2f8cee47%3A4a8740e01813
Software / code / prosody
Changeset
12802:4a8740e01813
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 12 Dec 2022 07:10:54 +0100 |
| parents | 12801:ebd6b4d8bf04 (diff) 12800:06ba2f8cee47 (current diff) |
| children | 12803:2e12290820e8 |
| files | plugins/mod_smacks.lua teal-src/core/storagemanager.d.tl util/stanza.lua |
| diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Nov 18 16:18:47 2022 +0100 +++ b/.hgtags Mon Dec 12 07:10:54 2022 +0100 @@ -80,5 +80,8 @@ d117b92fd8e459170a98a8dece7f3930f4b6aed7 0.11.10 76b4e3f12b53fedae96402d87fa9ee79e704ce5e 0.11.11 783056b4e4480389d0e27883289b1bfef57e4729 0.11.12 +ebeb4d959fb3fdbc9235fd42e16a33f3f78241a8 0.11.13 50fcd387948263335ca98dc98de2a3087b543f8b 0.12.0 252ed01896dd815700593b86834c776d0fef828d 0.12.1 +be09ac8300a7bde4e81f7cc4e4ee5b0745ab14b7 0.11.14 +3784a8ce05961ddc0f0374f8c12618d9a411546b 0.12.2
--- a/plugins/mod_smacks.lua Fri Nov 18 16:18:47 2022 +0100 +++ b/plugins/mod_smacks.lua Mon Dec 12 07:10:54 2022 +0100 @@ -325,7 +325,8 @@ local resume_token; local resume = stanza.attr.resume; - if resume == "true" or resume == "1" then + if (resume == "true" or resume == "1") and session.username then + -- resumption on s2s is not currently supported resume_token = new_id(); end
--- a/util/stanza.lua Fri Nov 18 16:18:47 2022 +0100 +++ b/util/stanza.lua Mon Dec 12 07:10:54 2022 +0100 @@ -37,8 +37,12 @@ local stanza_mt = { __name = "stanza" }; stanza_mt.__index = stanza_mt; +-- Basic check for valid XML character data. +-- Disallow control characters. +-- Tab U+09 and newline U+0A are allowed. +-- For attributes, allow the \1 separator between namespace and name. local function valid_xml_cdata(str, attr) - return not s_find(str, attr and "[^\1\9\10\13\20-~\128-\247]" or "[^\9\10\13\20-~\128-\247]"); + return not s_find(str, attr and "[^\1\9\10\13\20-\255]" or "[^\9\10\13\20-\255]"); end local function check_name(name, name_type)
