From 14ef5645383a36383082b75a8495c5df53f18f26 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Mon, 11 Nov 2019 00:39:20 -0500
Subject: Tails 6156 - Fix outdated error handling in accountcreation and
 remove buggy debug code

Tag #1273
---
 mailnews/base/prefs/content/accountcreation/fetchhttp.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'mailnews/base/prefs/content/accountcreation/fetchhttp.js')

diff --git a/mailnews/base/prefs/content/accountcreation/fetchhttp.js b/mailnews/base/prefs/content/accountcreation/fetchhttp.js
index 04f5272cd..d2323f7b6 100644
--- a/mailnews/base/prefs/content/accountcreation/fetchhttp.js
+++ b/mailnews/base/prefs/content/accountcreation/fetchhttp.js
@@ -159,17 +159,14 @@ FetchHTTP.prototype =
     else
     {
       success = false;
-      try
-      {
-        errorCode = this._request.status;
-        errorStr = this._request.statusText;
-      } catch (e) {
-        // If we can't resolve the hostname in DNS etc., .statusText throws
-        errorCode = -2;
+      errorCode = this._request.status;
+      if (errorCode == 0) {
         errorStr = getStringBundle(
-                   "chrome://messenger/locale/accountCreationUtil.properties")
-                   .GetStringFromName("cannot_contact_server.error");
+            "chrome://messenger/locale/accountCreationUtil.properties")
+            .GetStringFromName("cannot_contact_server.error");
         ddump(errorStr);
+      } else {
+        errorStr = this._request.statusText;
       }
     }
 
-- 
cgit v1.2.3