[mms] Added direct TLS v1.x connection option when connecting to remo…

…te server.
horde · Oct 30, 2013 · 75f216a · 75f216a
1 parent f35742f
commit 75f216a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/framework/Smtp/doc/Horde/Smtp/UPGRADING b/framework/Smtp/doc/Horde/Smtp/UPGRADING
@@ -14,6 +14,12 @@ This lists the API changes between releases of the package.
 Upgrading to 1.3.0
 ==================
 
+  - Horde_Imap_Client_Base
+
+    - Constructor
+
+      Added 'tlsv1' option for the 'secure' configuration parameter.
+
   - Horde_Smtp_Password_Xoauth2
 
     Added class to abstract production of the necessary token for XOAUTH2 SASL

diff --git a/framework/Smtp/lib/Horde/Smtp.php b/framework/Smtp/lib/Horde/Smtp.php
@@ -106,13 +106,17 @@ class Horde_Smtp implements Serializable
      *  </li>
      *  <li>
      *   secure: (string) Use SSL or TLS to connect.
-     *           DEFAULT: true (use TLS, if available)
+     *           DEFAULT: true (use 'tls' option, if available)
      *   <ul>
      *    <li>false (No encryption)</li>
      *    <li>'ssl' (Auto-detect SSL version)</li>
      *    <li>'sslv2' (Force SSL version 3)</li>
      *    <li>'sslv3' (Force SSL version 2)</li>
-     *    <li>'tls' (TLS)</li>
+     *    <li>'tls' (TLS; started via protocol-level negotation over
+     *    unencrypted channel; RECOMMENDED way of initiating secure
+     *    connection)
+     *    <li>'tlsv1' (TLS direct version 1.x connection to server) [@since
+     *    1.3.0]</li>
      *    <li>true (Use TLS, if available) [@since 1.2.0]</li>
      *   </ul>
      *  </li>

diff --git a/framework/Smtp/package.xml b/framework/Smtp/package.xml
@@ -21,6 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Added direct TLS v1.x connection option when connecting to remote server.
 * [mms] Added Horde_Smtp_Password_Xoauth2 class.
  </notes>
  <contents>
@@ -96,7 +97,7 @@
    <package>
     <name>Horde_Socket_Client</name>
     <channel>pear.horde.org</channel>
-    <min>1.0.0</min>
+    <min>1.1.0</min>
     <max>2.0.0alpha1</max>
     <exclude>2.0.0alpha1</exclude>
    </package>
@@ -290,6 +291,7 @@
    <date>2013-10-25</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Added direct TLS v1.x connection option when connecting to remote server.
 * [mms] Added Horde_Smtp_Password_Xoauth2 class.
    </notes>
   </release>