Software / code / prosody
Changeset
13079:e7a5e5a0dc02
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 19 Apr 2023 11:42:36 +0200 |
| parents | 13076:f4e33d17eaa8 (current diff) 13078:6da83deb8d7f (diff) |
| children | 13080:031382b207ec |
| files | plugins/mod_admin_shell.lua util/error.lua |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_admin_shell.lua Wed Apr 19 11:14:11 2023 +0200 +++ b/plugins/mod_admin_shell.lua Wed Apr 19 11:42:36 2023 +0200 @@ -903,7 +903,7 @@ width = math.max(#"Expired", #"Self-signed", #"Untrusted", #"Mismatched", #"Unknown"); mapper = function(cert_status, session) if cert_status then return capitalize(cert_status); end - if session.cert_chain_status == "Invalid" then + if session.cert_chain_status == "invalid" then local cert_errors = set.new(session.cert_chain_errors[1]); if cert_errors:contains("certificate has expired") then return "Expired";
--- a/util/error.lua Wed Apr 19 11:14:11 2023 +0200 +++ b/util/error.lua Wed Apr 19 11:42:36 2023 +0200 @@ -141,7 +141,7 @@ local error_tag = stanza:get_child("error"); context = context or {}; context.stanza = stanza; - context.by = error_tag.attr.by or stanza.attr.from; + context.by = error_tag and error_tag.attr.by or stanza.attr.from; local uri; if condition == "gone" or condition == "redirect" then
