From: pdontthink Date: Sun, 14 Jun 2015 10:15:51 +0000 (+0000) Subject: Sync configtest with core X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=3ee5d63bdd6f215e9d4c8add39b88a10dab56972 Sync configtest with core git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14502 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/src/configtest.php b/src/configtest.php index 8356ebe..92a5048 100644 --- a/src/configtest.php +++ b/src/configtest.php @@ -632,7 +632,10 @@ if($useSendmail) { echo $IND . "sendmail OK
\n"; } else { - $stream = fsockopen( ($use_smtp_tls==1?'tls://':'').$smtpServerAddress, $smtpPort, + // NB: Using "ssl://" ensures the highest possible TLS version + // will be negotiated with the server (whereas "tls://" only + // uses TLS version 1.0) + $stream = fsockopen( ($use_smtp_tls==1?'ssl://':'').$smtpServerAddress, $smtpPort, $errorNumber, $errorString); if(!$stream) { do_err("Error connecting to SMTP server \"$smtpServerAddress:$smtpPort\".". @@ -736,7 +739,10 @@ if($useSendmail) { echo "Checking IMAP service....
\n"; /** Can we open a connection? */ -$stream = fsockopen( ($use_imap_tls==1?'tls://':'').$imapServerAddress, $imapPort, +// NB: Using "ssl://" ensures the highest possible TLS version +// will be negotiated with the server (whereas "tls://" only +// uses TLS version 1.0) +$stream = fsockopen( ($use_imap_tls==1?'ssl://':'').$imapServerAddress, $imapPort, $errorNumber, $errorString); if(!$stream) { do_err("Error connecting to IMAP server \"$imapServerAddress:$imapPort\".".