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

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2023-04-19 11:42:36 +02:00
commit 6114ccee11
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_admin_shell.lua
View file

@ -903,7 +903,7 @@ available_columns = {
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";

2
util/error.lua
View file

@ -141,7 +141,7 @@ local function from_stanza(stanza, context, source)
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