From 45cb58760be8b0d54d41c55ea9dd4cb055b10727 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 18 Jan 2020 14:09:43 -0500 Subject: [PATCH] Issue #1358 - Default to SSL/TLS when using the Account Wizard --- mailnews/base/prefs/content/aw-incoming.js | 5 ++++- mailnews/mailnews.js | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mailnews/base/prefs/content/aw-incoming.js b/mailnews/base/prefs/content/aw-incoming.js index fcc063fedb..5ea0c77ae4 100644 --- a/mailnews/base/prefs/content/aw-incoming.js +++ b/mailnews/base/prefs/content/aw-incoming.js @@ -158,7 +158,10 @@ function setServerType() var serverType = document.getElementById("servertype").value; var deferStorageBox = document.getElementById("deferStorageBox"); var leaveMessages = document.getElementById("leaveMsgsOnSrvrBox"); - var port = serverType == "pop3" ? 110 : 143; + + // pop3 110 (unsecure) 995 (SSL) + // imap 143 (unsecure) 993 (SSL) + var port = serverType == "pop3" ? 995 : 993; document.getElementById("serverPort").value = port; document.getElementById("defaultPortValue").value = port; diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js index 705a0a08ad..7ebe2eaa7f 100644 --- a/mailnews/mailnews.js +++ b/mailnews/mailnews.js @@ -450,7 +450,7 @@ pref("mail.server.default.valid", true); pref("mail.server.default.abbreviate", true); pref("mail.server.default.isSecure", false); pref("mail.server.default.authMethod", 3); // cleartext password. @see nsIMsgIncomingServer.authMethod. -pref("mail.server.default.socketType", 0); // @see nsIMsgIncomingServer.socketType +pref("mail.server.default.socketType", 3); // SSL/TLS. @see nsIMsgIncomingServer.socketType pref("mail.server.default.override_namespaces", true); pref("mail.server.default.deferred_to_account", ""); @@ -579,7 +579,7 @@ pref("mail.smtp.useMatchingDomainServer", false); pref("mail.smtp.useMatchingHostNameServer", false); pref("mail.smtpserver.default.authMethod", 3); // cleartext password. @see nsIMsgIncomingServer.authMethod. -pref("mail.smtpserver.default.try_ssl", 0); // @see nsISmtpServer.socketType +pref("mail.smtpserver.default.try_ssl", 3); // SSL/TLS. @see nsISmtpServer.socketType // For the next 3 prefs, see pref("mail.display_glyph", true); // TXT->HTML :-) etc. in viewer