Bug 1499316 - Backed out changesets 8c530b9c0f4b and 0a2c39228302 to restore code to original state. a=backout
authorJorg K <jorgk@jorgk.com>
Fri, 09 Nov 2018 08:09:04 +0100
changeset 33680 5f68c3830a754bd1539ccfa3c607da2d4706ccf1
parent 33679 f025f3714b775a0f1f251854b1619662b545bdc3
child 33681 338864e8900ca5d551c4eed707ebbe5bc7b2b541
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersbackout
bugs1499316
Bug 1499316 - Backed out changesets 8c530b9c0f4b and 0a2c39228302 to restore code to original state. a=backout
mail/components/accountcreation/content/fetchConfig.js
--- a/mail/components/accountcreation/content/fetchConfig.js
+++ b/mail/components/accountcreation/content/fetchConfig.js
@@ -9,36 +9,34 @@
  * Params @see fetchConfigFromISP()
  */
 
 ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource:///modules/JXON.js");
 
 function fetchConfigFromDisk(domain, successCallback, errorCallback) {
-  // Disabled, see bug 1499316.
-  // return new TimeoutAbortable(runAsync(function() {
+  return new TimeoutAbortable(runAsync(function() {
     try {
       // <TB installdir>/isp/example.com.xml
       var configLocation = Services.dirsvc.get("CurProcD", Ci.nsIFile);
       configLocation.append("isp");
       configLocation.append(sanitize.hostname(domain) + ".xml");
 
       if (!configLocation.exists() || !configLocation.isReadable()) {
         errorCallback("local file not found");
-        return new Abortable();
+        return;
       }
       var contents =
         readURLasUTF8(Services.io.newFileURI(configLocation));
       let domParser = new DOMParser();
       successCallback(readFromXML(JXON.build(
         domParser.parseFromString(contents, "text/xml"))));
     } catch (e) { errorCallback(e); }
-  // }));
-  return new Abortable();
+  }));
 }
 
 /**
  * Tries to get a configuration from the ISP / mail provider directly.
  *
  * Disclaimers:
  * - To support domain hosters, we cannot use SSL. That means we
  *   rely on insecure DNS and http, which means the results may be