From 259b7fa0650fea9320b38cb17c4e80497acae7a3 Mon Sep 17 00:00:00 2001 From: Sebastiaan Lokhorst Date: Wed, 4 Dec 2019 12:08:33 +0100 Subject: [PATCH] Explain difference between ssl:// and tls:// for default_host (#7099) --- config/config.inc.php.sample | 3 ++- config/defaults.inc.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/config.inc.php.sample b/config/config.inc.php.sample index b4b02fee6..fad6e68c4 100644 --- a/config/config.inc.php.sample +++ b/config/config.inc.php.sample @@ -30,7 +30,8 @@ $config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail'; // The IMAP host chosen to perform the log-in. // Leave blank to show a textbox at login, give a list of hosts // to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Enter hostname with prefix ssl:// to use Implicit TLS, or use +// prefix tls:// to use STARTTLS. // Supported replacement variables: // %n - hostname ($_SERVER['SERVER_NAME']) // %t - hostname without the first part diff --git a/config/defaults.inc.php b/config/defaults.inc.php index eb448c6d3..5ded7abf7 100644 --- a/config/defaults.inc.php +++ b/config/defaults.inc.php @@ -134,7 +134,8 @@ $config['redis_debug'] = false; // The IMAP host chosen to perform the log-in. // Leave blank to show a textbox at login, give a list of hosts // to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Enter hostname with prefix ssl:// to use Implicit TLS, or use +// prefix tls:// to use STARTTLS. // Supported replacement variables: // %n - hostname ($_SERVER['SERVER_NAME']) // %t - hostname without the first part