From aaa81d354000be56e3ea6709e0f39a2c93f04174 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 1 Jun 2018 17:55:25 +0000 Subject: XML: handle erlang errors too --- lib/pleroma/web/xml/xml.ex | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/pleroma/web/xml/xml.ex b/lib/pleroma/web/xml/xml.ex index 36430a3fa..da3f68ecb 100644 --- a/lib/pleroma/web/xml/xml.ex +++ b/lib/pleroma/web/xml/xml.ex @@ -32,6 +32,10 @@ defmodule Pleroma.Web.XML do :exit, _error -> Logger.debug("Couldn't parse XML: #{inspect(text)}") :error + rescue + e -> + Logger.debug("Couldn't parse XML: #{inspect(text)}") + :error end end end -- cgit v1.2.3 From 1abf0f3b3e487110c097cc444f8febb66921f7ea Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 1 Jun 2018 17:58:20 +0000 Subject: webfinger: use https as default fallback instead of http realistically, all instances need to be on https anyway to properly federate with all software --- lib/pleroma/web/web_finger/web_finger.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex index 9c6f1cb68..0b417479d 100644 --- a/lib/pleroma/web/web_finger/web_finger.ex +++ b/lib/pleroma/web/web_finger/web_finger.ex @@ -253,7 +253,7 @@ defmodule Pleroma.Web.WebFinger do String.replace(template, "{uri}", URI.encode(account)) _ -> - "http://#{domain}/.well-known/webfinger?resource=acct:#{account}" + "https://#{domain}/.well-known/webfinger?resource=acct:#{account}" end with response <- -- cgit v1.2.3