[Libreoffice-commits] core.git: sw/source

[Justin Luth]

 sw/source/uibase/dbui/mmconfigitem.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 769af98f887a742261886f960212d9d3f581e973
Author: Justin Luth <justin_luth at sil.org>
Date:   Wed Jan 17 21:40:57 2018 +0300

    mailconfig: default to secure port 587
    
    A very readable explanation of ports 25 / 465 / 587 was
    http://blog.mailgun.com/25-465-587-what-port-should-i-use/
    
    In short, 465 was a very temporary and never official port
    to use for encrypted sending. Port 587 is the official
    port for encrypted (or even non-encrypted) mail submissions.
    
    For a very long time now, every public mail server (and likely
    even private internal servers) supports STARTTLS, so default
    to using secure connections.
    
    Change-Id: Ic8a6886221fa2e7b733b2535a84a584fe64d3165
    Reviewed-on: https://gerrit.libreoffice.org/48075
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
    Tested-by: Heiko Tietze <tietze.heiko at gmail.com>
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 957d65474724..92fbccf8381d 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -59,7 +59,7 @@ const char cDataSourceName[]         = "DataSource/DataSourceName";
 const char cDataTableName[]          = "DataSource/DataTableName" ;
 const char cDataCommandType[]        = "DataSource/DataCommandType";
 
-#define SECURE_PORT     465
+#define SECURE_PORT     587
 #define DEFAULT_PORT    25
 #define POP_PORT        110
 
@@ -196,7 +196,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() :
         m_nMailPort(0),
         m_bIsMailReplyTo(false),
         m_bIsDefaultPort(false),
-        m_bIsSecureConnection(false),
+        m_bIsSecureConnection(true),
         m_bIsAuthentication(false),
 
         m_bIsEMailSupported(false),