Permalink
Browse files

Clarify tls:// and ssl:// settings for connecting to SMTP server

  • Loading branch information...
1 parent e08f22e commit 5db83ee04d7064da47afb9375046ae9999183868 @slokhorst slokhorst committed Jan 9, 2017
Showing with 4 additions and 3 deletions.
  1. +2 −2 config/config.inc.php.sample
  2. +2 −1 config/defaults.inc.php
@@ -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:
@JohnDoh
JohnDoh Jan 9, 2017 Contributor

I think the Supported replacement variables line has been removed in error here.

@slokhorst
slokhorst Jan 9, 2017 Contributor

Oops, sorry! See #5586

+// 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
@@ -239,7 +239,8 @@
// ----------------------------------
// 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'])

0 comments on commit 5db83ee

Please sign in to comment.