[SM-CVS] SF.net SVN: squirrelmail:[14503] branches/SM-1_4-STABLE/squirrelmail/src/ configtest.php

[<pdo...@us...>]

Revision: 14503
          http://sourceforge.net/p/squirrelmail/code/14503
Author:   pdontthink
Date:     2015-06-14 10:19:14 +0000 (Sun, 14 Jun 2015)
Log Message:
-----------
Sync configtest with core

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/src/configtest.php

Modified: branches/SM-1_4-STABLE/squirrelmail/src/configtest.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/configtest.php	2015-06-14 10:15:51 UTC (rev 14502)
+++ branches/SM-1_4-STABLE/squirrelmail/src/configtest.php	2015-06-14 10:19:14 UTC (rev 14503)
@@ -1,4 +1,5 @@
 <?php
+echo "Disallowed"; die;
 
 /**
  * SquirrelMail configtest script
@@ -382,7 +383,10 @@
 
     echo $IND . "sendmail OK<br />\n";
 } else {
-    $stream = fsockopen( ($use_smtp_tls?'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?'ssl://':'').$smtpServerAddress, $smtpPort,
             $errorNumber, $errorString);
     if(!$stream) {
         do_err("Error connecting to SMTP server \"$smtpServerAddress:$smtpPort\".".
@@ -427,7 +431,10 @@
 echo "Checking IMAP service....<br />\n";
 
 /** Can we open a connection? */
-$stream = fsockopen( ($use_imap_tls?'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?'ssl://':'').$imapServerAddress, $imapPort,
         $errorNumber, $errorString);
 if(!$stream) {
     do_err("Error connecting to IMAP server \"$imapServerAddress:$imapPort\".".

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.