Allow SSL socket context to be specified as well

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

config/config_local.example.php

@@ -54,26 +54,32 @@
  *
  * $smtpSslOptions allows more control over the SSL context used
  * when connecting to the SMTP server over SSL/TLS.  See:
+ * http://www.php.net/manual/context.php and in particular
  * http://php.net/manual/context.ssl.php
  * For example, you can specify a CA file that corresponds
  * to your server's certificate and make sure that the
  * server's certificate is validated when connecting:
  * $smtpSslOptions = array(
- *     'cafile' => '/etc/pki/tls/certs/ca-bundle.crt',
- *     'verify_peer' => true,
- *     'verify_depth' => 3,
+ *     'ssl' => array(
+ *         'cafile' => '/etc/pki/tls/certs/ca-bundle.crt',
+ *         'verify_peer' => true,
+ *         'verify_depth' => 3,
+ *     ),
  * );
  *
  * $imapSslOptions allows more control over the SSL context used
  * when connecting to the IMAP server over SSL/TLS.  See:
+ * http://www.php.net/manual/context.php and in particular
  * http://php.net/manual/context.ssl.php
  * For example, you can specify a CA file that corresponds
  * to your server's certificate and make sure that the
  * server's certificate is validated when connecting:
  * $imapSslOptions = array(
- *     'cafile' => '/etc/pki/tls/certs/ca-bundle.crt',
- *     'verify_peer' => true,
- *     'verify_depth' => 3,
+ *     'ssl' => array(
+ *         'cafile' => '/etc/pki/tls/certs/ca-bundle.crt',
+ *         'verify_peer' => true,
+ *         'verify_depth' => 3,
+ *     ),
  * );
  */
 

functions/imap_general.php

@@ -691,8 +691,6 @@ function sqimap_create_stream($server,$port,$tls=0,$ssl_options=array()) {
         if ((check_php_version(4,3)) and (extension_loaded('openssl'))) {
             if (function_exists('stream_socket_client')) {
                 $server_address = 'ssl://' . $server . ':' . $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