Add onError to dart:io SecureSocket. Allow onConnect and outputStream to coexist on Socket and Sec…

runtime/bin/socket_patch.dart

 // Copyright (c) 2012, 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.
 
 patch class ServerSocket {
   /* patch */ factory ServerSocket(String bindAddress, int port, int backlog) {
     return new _ServerSocket(bindAddress, port, backlog);
   }
 }
 
@@ skipping 451 matching lines @@
             "Cannot set write handler when output stream is used");
     _clientWriteHandler = callback;
     _updateOutHandler();
   }
 
   void set onConnect(void callback()) {
     if (_seenFirstOutEvent) {
       throw new StreamException(
           "Cannot set connect handler when already connected");
     }
-    if (_outputStream != null) {
-      throw new StreamException(
-          "Cannot set connect handler when output stream is used");
-    }
     _clientConnectHandler = callback;
     _updateOutHandler();
   }
 
   void set onData(void callback()) {
     if (_inputStream != null) throw new StreamException(
             "Cannot set data handler when input stream is used");
     _onData = callback;
   }
 
@@ skipping 14 matching lines @@
         throw new StreamException(
             "Cannot get input stream when socket handlers are used");
       }
       _inputStream = new _SocketInputStream(this);
     }
     return _inputStream;
   }
 
   OutputStream get outputStream {
     if (_outputStream == null) {
-      if (_handlerMap[_SocketBase._OUT_EVENT] != null) {
+      if (_clientWriteHandler != null) {
         throw new StreamException(
             "Cannot get output stream when socket handlers are used");
       }
       _outputStream = new _SocketOutputStream(this);
     }
     return _outputStream;
   }
 
   void set _onWrite(void callback()) {
     _setHandler(_SocketBase._OUT_EVENT, callback);
@@ skipping 77 matching lines @@
   bool _seenFirstOutEvent = false;
   bool _pipe = false;
   Function _clientConnectHandler;
   Function _clientWriteHandler;
   _SocketInputStream _inputStream;
   _SocketOutputStream _outputStream;
   String _remoteHost;
   int _remotePort;
   static SendPort _socketService;
 }