Allow SSL socket context to be specified as well

[squirrelmail.git] / class / deliver / Deliver_SMTP.class.php

diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php
index 641fbe79b3ac11e294497e48d355579462190b44..fc61d35263b0b4b99cc75a417229672cdb7dfcc0 100644 (file)
--- a/class/deliver/Deliver_SMTP.class.php
+++ b/class/deliver/Deliver_SMTP.class.php
@@ -98,8 +98,6 @@ class Deliver_SMTP extends Deliver {
             if ((check_php_version(4,3)) && (extension_loaded('openssl'))) {
                 if (function_exists('stream_socket_client')) {
                     $server_address = 'ssl://' . $host . ':' . $port;
-                    if (!empty($ssl_options))
-                        $ssl_options = array('ssl' => $ssl_options);
                     $ssl_context = @stream_context_create($ssl_options);
                     $connect_timeout = ini_get('default_socket_timeout');
                     // null timeout is broken