Added timeout parameter to RawSecureSocket and SecureSocket connect methods. Also updated CHANGELOG…

sdk/lib/io/secure_socket.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.io;
 
 /**
  * A high-level class for communicating securely over a TCP socket, using
  * TLS and SSL. The [SecureSocket] exposes both a [Stream] and an
  * [IOSink] interface, making it ideal for using together with
@@ skipping 15 matching lines @@
    * [onBadCertificate] is an optional handler for unverifiable certificates.
    * The handler receives the [X509Certificate], and can inspect it and
    * decide (or let the user decide) whether to accept
    * the connection or not.  The handler should return true
    * to continue the [SecureSocket] connection.
    *
    * [supportedProtocols] is an optional list of protocols (in decreasing
    * order of preference) to use during the ALPN protocol negogiation with the
    * server.  Example values are "http/1.1" or "h2".  The selected protocol
    * can be obtained via [SecureSocket.selectedProtocol].
+   *
+   * The argument [timeout] is used to specify the maximum allowed time to wait
+   * for a connection to be established. If [timeout] is longer than the system
+   * level timeout duration, a timeout may occur sooner than specified in
+   * [timeout]. On timeout, a [SocketException] is thrown and all ongoing
+   * connection attempts to [host] are cancelled.
+
    */
   static Future<SecureSocket> connect(host, int port,
       {SecurityContext context,
       bool onBadCertificate(X509Certificate certificate),
-      List<String> supportedProtocols}) {
+      List<String> supportedProtocols,
+      Duration timeout}) {
     return RawSecureSocket
         .connect(host, port,
             context: context,
             onBadCertificate: onBadCertificate,
-            supportedProtocols: supportedProtocols)
+            supportedProtocols: supportedProtocols,
+            timeout: timeout)
         .then((rawSocket) => new SecureSocket._(rawSocket));
   }
 
   /**
    * Takes an already connected [socket] and starts client side TLS
    * handshake to make the communication secure. When the returned
    * future completes the [SecureSocket] has completed the TLS
    * handshake. Using this function requires that the other end of the
    * connection is prepared for TLS handshake.
    *
@@ skipping 131 matching lines @@
    * to continue the [RawSecureSocket] connection.
    *
    * [supportedProtocols] is an optional list of protocols (in decreasing
    * order of preference) to use during the ALPN protocol negogiation with the
    * server.  Example values are "http/1.1" or "h2".  The selected protocol
    * can be obtained via [RawSecureSocket.selectedProtocol].
    */
   static Future<RawSecureSocket> connect(host, int port,
       {SecurityContext context,
       bool onBadCertificate(X509Certificate certificate),
-      List<String> supportedProtocols}) {
+      List<String> supportedProtocols,
+      Duration timeout}) {
     _RawSecureSocket._verifyFields(
         host, port, false, false, false, onBadCertificate);
-    return RawSocket.connect(host, port).then((socket) {
+    return RawSocket.connect(host, port, timeout: timeout).then((socket) {
       return secure(socket,
           context: context,
           onBadCertificate: onBadCertificate,
           supportedProtocols: supportedProtocols);
     });
   }
 
   /**
    * Takes an already connected [socket] and starts client side TLS
    * handshake to make the communication secure. When the returned
@@ skipping 1018 matching lines @@
 
 /**
  * An exception that happens in the handshake phase of establishing
  * a secure network connection, when looking up or verifying a
  * certificate.
  */
 class CertificateException extends TlsException {
   const CertificateException([String message = "", OSError osError = null])
       : super._("CertificateException", message, osError);
 }