From 5db83ee04d7064da47afb9375046ae9999183868 Mon Sep 17 00:00:00 2001 From: Sebastiaan Lokhorst Date: Mon, 9 Jan 2017 15:12:02 +0100 Subject: [PATCH] Clarify tls:// and ssl:// settings for connecting to SMTP server --- config/config.inc.php.sample | 4 ++-- config/defaults.inc.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/config.inc.php.sample b/config/config.inc.php.sample index 77f367265..41c3316b1 100644 --- a/config/config.inc.php.sample +++ b/config/config.inc.php.sample @@ -40,8 +40,8 @@ $config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail'; $config['default_host'] = 'localhost'; // SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: +// Enter hostname with prefix tls:// to use STARTTLS, or use +// prefix ssl:// to use the deprecated SSL over SMTP (aka SMTPS) // %h - user's IMAP hostname // %n - hostname ($_SERVER['SERVER_NAME']) // %t - hostname without the first part diff --git a/config/defaults.inc.php b/config/defaults.inc.php index 5ef1a295d..28cf73df6 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -239,7 +239,8 @@ $config['messages_cache_threshold'] = 50; // ---------------------------------- // SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Enter hostname with prefix tls:// to use STARTTLS, or use +// prefix ssl:// to use the deprecated SSL over SMTP (aka SMTPS) // Supported replacement variables: // %h - user's IMAP hostname // %n - hostname ($_SERVER['SERVER_NAME'])