[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[14432] branches/SM-1_4-STABLE/squirrelmail
From:       pdontthink () users ! sourceforge ! net
Date:       2014-01-21 3:40:42
Message-ID: E1W5SCj-00056S-Pn () sfs-ml-3 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 14432
          http://sourceforge.net/p/squirrelmail/code/14432
Author:   pdontthink
Date:     2014-01-21 03:40:40 +0000 (Tue, 21 Jan 2014)
Log Message:
-----------
Allow SSL socket context to be specified as well

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2014-01-21 \
                03:20:48 UTC (rev 14431)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2014-01-21 \
03:40:40 UTC (rev 14432) @@ -449,7 +449,7 @@
      * @param string  $pass     password to log into the SMTP server with
      * @param boolean $authpop  whether or not to use POP-before-SMTP authorization
      * @param string  $pop_host host name or IP to connect to for POP-before-SMTP \
                authorization
-     * @param array   $ssl_options SSL context options (OPTIONAL), see \
http://www.php.net/manual/context.ssl.php +     * @param array   $ssl_options SSL \
context options (OPTIONAL), see http://www.php.net/manual/context.php and especially \
                http://www.php.net/manual/context.ssl.php
      *
      * @return handle $stream file handle resource to SMTP stream
      */

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php	2014-01-21 \
                03:20:48 UTC (rev 14431)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php	2014-01-21 \
03:40:40 UTC (rev 14432) @@ -62,8 +62,6 @@
         if (($use_smtp_tls == true) and (check_php_version(4,3)) and \
(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

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php	2014-01-21 \
                03:20:48 UTC (rev 14431)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php	2014-01-21 \
03:40:40 UTC (rev 14432) @@ -519,8 +519,6 @@
     if (($use_imap_tls == true) and (check_php_version(4,3)) and \
(extension_loaded('openssl'))) {  if (function_exists('stream_socket_client')) {
             $server_address = 'ssl://' . $imap_server_address . ':' . $imap_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

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


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]