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

List:       pear-cvs
Subject:    [PEAR-CVS] cvs: pear /Net_SMTP SMTP.php package.xml
From:       "Jon Parise" <jon () php ! net>
Date:       2009-05-28 1:36:44
Message-ID: cvsjon1243474604 () cvsserver
[Download RAW message or body]

jon		Thu May 28 01:36:44 2009 UTC

  Modified files:              
    /pear/Net_SMTP	SMTP.php package.xml 
  Log:
  We no longer attempt a TLS connection if we're already using a secure socket.
  
  Bug: #16254
  
  
http://cvs.php.net/viewvc.cgi/pear/Net_SMTP/SMTP.php?r1=1.66&r2=1.67&diff_format=u
Index: pear/Net_SMTP/SMTP.php
diff -u pear/Net_SMTP/SMTP.php:1.66 pear/Net_SMTP/SMTP.php:1.67
--- pear/Net_SMTP/SMTP.php:1.66	Mon May 25 23:27:27 2009
+++ pear/Net_SMTP/SMTP.php	Thu May 28 01:36:44 2009
@@ -18,7 +18,7 @@
 // |          Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>      |
 // +----------------------------------------------------------------------+
 //
-// $Id: SMTP.php,v 1.66 2009/05/25 23:27:27 jon Exp $
+// $Id: SMTP.php,v 1.67 2009/05/28 01:36:44 jon Exp $
 
 require_once 'PEAR.php';
 require_once 'Net/Socket.php';
@@ -486,7 +486,14 @@
      */
     function auth($uid, $pwd , $method = '')
     {
-        if (version_compare(PHP_VERSION, '5.1.0', '>=') && \
extension_loaded('openssl') && isset($this->_esmtp['STARTTLS'])) { +        /* We can \
only attempt a TLS connection if we're running PHP 5.1.0 or  +         * later, have \
access to the OpenSSL extension, are connected to an  +         * SMTP server which \
supports the STARTTLS extension, and aren't  +         * already connected over a \
secure (SSL) socket connection. */ +        $tls = version_compare(PHP_VERSION, \
'5.1.0', '>=') && extension_loaded('openssl') && +               \
isset($this->_esmtp['STARTTLS']) && strncasecmp($this->host, 'ssl://', 6) != 0; +
+        if ($tls) {
             if (PEAR::isError($result = $this->_put('STARTTLS'))) {
                 return $result;
             }
http://cvs.php.net/viewvc.cgi/pear/Net_SMTP/package.xml?r1=1.53&r2=1.54&diff_format=u
Index: pear/Net_SMTP/package.xml
diff -u pear/Net_SMTP/package.xml:1.53 pear/Net_SMTP/package.xml:1.54
--- pear/Net_SMTP/package.xml:1.53	Mon May 25 23:27:27 2009
+++ pear/Net_SMTP/package.xml	Thu May 28 01:36:44 2009
@@ -19,8 +19,8 @@
   <email>chuck@horde.org</email>
   <active>yes</active>
  </lead>
- <date>2009-05-25</date>
- <time>16:25:00</time>
+ <date>2009-05-27</date>
+ <time>18:35:00</time>
  <version>
   <release>1.3.3</release>
   <api>1.1.0</api>
@@ -31,6 +31,7 @@
  </stability>
  <license uri="http://www.php.net/license/3_01.txt">PHP License</license>
  <notes>- Added getGreeting(), for retrieving the server's greeting string. (Request \
#16066) +- We no longer attempt a TLS connection if we're already using a secure \
socket. (Bug #16254)  </notes>
  <contents>
   <dir baseinstalldir="Net" name="/">



-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


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