Recommit "Fix issues with Socket shutdown.""

runtime/bin/socket_patch.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.
 
 patch class RawServerSocket {
   /* patch */ static Future<RawServerSocket> bind(address,
                                                   int port,
                                                   {int backlog: 0,
                                                    bool v6Only: false,
                                                    bool shared: false}) {
@@ skipping 269 matching lines @@
   static const Duration _RETRY_DURATION_LOOPBACK =
       const Duration(milliseconds: 25);
 
   // Use default Map so we keep order.
   static Map<int, _NativeSocket> _sockets = new Map<int, _NativeSocket>();
 
   // Socket close state
   bool isClosed = false;
   bool isClosing = false;
   bool isClosedRead = false;
+  bool closedReadEventSent = false;
   bool isClosedWrite = false;
   Completer closeCompleter = new Completer.sync();
 
   // Handlers and receive port for socket events from the event handler.
   final List eventHandlers = new List(EVENT_COUNT + 1);
   RawReceivePort eventPort;
   bool flagsSent = false;
 
   // The type flags for this socket.
   final int typeFlags;
@@ skipping 387 matching lines @@
     return nativeGetRemotePeer()[1];
   }
 
   InternetAddress get remoteAddress {
     var result = nativeGetRemotePeer()[0];
     var type = new InternetAddressType._from(result[0]);
     return new _InternetAddress(result[1], null, result[2]);
   }
 
   void issueReadEvent() {
+    if (closedReadEventSent) return;
     if (readEventIssued) return;
     readEventIssued = true;
     void issue() {
       readEventIssued = false;
       if (isClosing) return;
       if (!sendReadEvents) return;
       if (available == 0) {
-        if (isClosedRead) {
+        if (isClosedRead && !closedReadEventSent) {
           if (isClosedWrite) close();
           var handler = eventHandlers[CLOSED_EVENT];
           if (handler == null) return;
+          closedReadEventSent = true;
           handler();
         }
         return;
       }
       var handler = eventHandlers[READ_EVENT];
       if (handler == null) return;
       readEventIssued = true;
       handler();
       scheduleMicrotask(issue);
     }
@@ skipping 135 matching lines @@
           close();
           break;
         default:
           throw new ArgumentError(direction);
       }
     }
   }
 
   void shutdownWrite() {
     if (!isClosing && !isClosed) {
-      if (isClosedRead) {
+      if (closedReadEventSent) {
         close();
       } else {
         sendToEventHandler(1 << SHUTDOWN_WRITE_COMMAND);
       }
       isClosedWrite = true;
     }
   }
 
   void shutdownRead() {
     if (!isClosing && !isClosed) {
@@ skipping 469 matching lines @@
       error: zone.bindUnaryCallback((e) {
         _controller.addError(e);
         _socket.close();
       })
     );
   }
 
   factory _RawSocket._writePipe() {
     var native = new _NativeSocket.pipe();
     native.isClosedRead = true;
+    native.closedReadEventSent = true;
     return new _RawSocket(native);
   }
 
   factory _RawSocket._readPipe(int fd) {
     var native = new _NativeSocket.pipe();
     native.isClosedWrite = true;
     if (fd != null) _getStdioHandle(native, fd);
     var result = new _RawSocket(native);
     result._isMacOSTerminalInput =
         Platform.isMacOS &&
@@ skipping 601 matching lines @@
                        String address,
                        List<int> in_addr,
                        int port) {
   return new Datagram(
       data,
       new _InternetAddress(address, null, in_addr),
       port);
 }
 
 String _socketsStats() => _SocketsObservatory.toJSON();