summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyril Brulebois <ckb@riseup.net>2019-03-17 05:09:09 +0100
committerCyril Brulebois <ckb@riseup.net>2019-03-17 05:09:41 +0100
commitf8cf9ecc9c14330606b3f12e6e4c8db2b1ed1aa6 (patch)
tree0b4b0d28f410555c1deb0a70d3252b7d05dc5fb8
parent54383d5aac23380c693fb4243049f3324531cb35 (diff)
Refresh patch due to context changes: Add-pref-for-setting-the-autoconfiguration-guess-tim.patchtb65-wip
-rw-r--r--debian/patches/secure-account-creation/Add-pref-for-setting-the-autoconfiguration-guess-tim.patch35
1 files changed, 14 insertions, 21 deletions
diff --git a/debian/patches/secure-account-creation/Add-pref-for-setting-the-autoconfiguration-guess-tim.patch b/debian/patches/secure-account-creation/Add-pref-for-setting-the-autoconfiguration-guess-tim.patch
index 3d2de1e..1d3c876 100644
--- a/debian/patches/secure-account-creation/Add-pref-for-setting-the-autoconfiguration-guess-tim.patch
+++ b/debian/patches/secure-account-creation/Add-pref-for-setting-the-autoconfiguration-guess-tim.patch
@@ -11,12 +11,10 @@ extension to override this timeout.
comm/mailnews/mailnews.js | 2 ++
2 files changed, 4 insertions(+), 3 deletions(-)
-diff --git a/comm/mail/components/accountcreation/content/guessConfig.js b/comm/mail/components/accountcreation/content/guessConfig.js
-index a91dd0a9d6d..83d2dd6aacc 100644
--- a/comm/mail/components/accountcreation/content/guessConfig.js
+++ b/comm/mail/components/accountcreation/content/guessConfig.js
-@@ -8,8 +8,6 @@
- var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js", null);
+@@ -6,8 +6,6 @@
+ ChromeUtils.import("resource:///modules/gloda/log4moz.js");
ChromeUtils.import("resource://gre/modules/Services.jsm");
-var TIMEOUT = 10; // in seconds
@@ -24,28 +22,26 @@ index a91dd0a9d6d..83d2dd6aacc 100644
// This is a bit ugly - we set outgoingDone to false
// when emailWizard.js cancels the outgoing probe because the user picked
// an outoing server. It does this by poking the probeAbortable object,
-@@ -426,6 +424,7 @@ HostDetector.prototype = {
+@@ -456,6 +454,7 @@ HostDetector.prototype =
if (this._cancel)
return;
var me = this;
+ var timeout = Services.prefs.getIntPref("mailnews.auto_config.guess.timeout");
- for (let i = 0; i < this._hostsToTry.length; i++) {
+ for (let i = 0; i < this._hostsToTry.length; i++)
+ {
let thisTry = this._hostsToTry[i]; // {HostTry}
- if (thisTry.status != kNotTried)
-@@ -447,7 +446,7 @@ HostDetector.prototype = {
+@@ -478,7 +477,7 @@ HostDetector.prototype =
}
- thisTry.abortable = SocketUtil(
- thisTry.hostname, thisTry.port, thisTry.ssl,
-- thisTry.commands, TIMEOUT, proxyInfo,
-+ thisTry.commands, timeout, proxyInfo,
- new SSLErrorHandler(thisTry, this._log),
- function(wiredata) { // result callback
- if (me._cancel)
-diff --git a/comm/mailnews/mailnews.js b/comm/mailnews/mailnews.js
-index 6c82f3e4b4d..7f2d235325b 100644
+ thisTry.abortable = SocketUtil(
+ thisTry.hostname, thisTry.port, thisTry.ssl,
+- thisTry.commands, TIMEOUT, proxyInfo,
++ thisTry.commands, timeout, proxyInfo,
+ new SSLErrorHandler(thisTry, this._log),
+ function(wiredata) // result callback
+ {
--- a/comm/mailnews/mailnews.js
+++ b/comm/mailnews/mailnews.js
-@@ -921,6 +921,8 @@ pref("mailnews.auto_config.ssl_only_config_servers", false);
+@@ -918,6 +918,8 @@ pref("mailnews.auto_config.ssl_only_conf
// protocol default ports and common domain practices
// (e.g. {mail,pop,imap,smtp}.<email-domain>).
pref("mailnews.auto_config.guess.enabled", true);
@@ -54,6 +50,3 @@ index 6c82f3e4b4d..7f2d235325b 100644
// Whether we allow fetched configurations using OAuth2.
pref("mailnews.auto_config.account_constraints.allow_oauth2", true);
// Work around bug 1454325 by disabling mimetype mungling in XmlHttpRequest
---
-2.11.0
-