CRM-18408 - Net_SMTP - Use CA_Config for SSL options

civicrm · May 10, 2017 · 1f656ec · 1f656ec
1 parent 61ac02e
commit 1f656ec
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/Net/SMTP.php b/Net/SMTP.php
@@ -183,6 +183,14 @@ function __construct($host = null, $port = null, $localhost = null,
         }
         $this->pipelining = $pipelining;
 
+        if (!isset($socket_options['ssl'])) {
+            if (!is_array($socket_options)) $socket_options = array();
+            $caConfig = CA_Config_Stream::singleton();
+            if ($caConfig->isEnableSSL()) {
+                $socket_options['ssl'] = $caConfig->toStreamOptions();
+            }
+        }
+
         $this->_socket = new Net_Socket();
         $this->_socket_options = $socket_options;
         $this->_timeout = $timeout;