Avoid picking port 65535 for ServerSockets, when any is requested.

runtime/bin/socket_android.cc

 // 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.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include <errno.h>  // NOLINT
 #include <stdio.h>  // NOLINT
 #include <stdlib.h>  // NOLINT
@@ skipping 305 matching lines @@
 
   SocketAddress::SetAddrPort(&addr, port);
   if (TEMP_FAILURE_RETRY(
           bind(fd,
                &addr.addr,
                SocketAddress::GetAddrLength(&addr))) < 0) {
     TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
+  // Test for invalid socket port 65535 (some browsers disallow it).
+  if (port == 0 && Socket::GetPort(fd) == 65535) {
+    // Don't close fd until we have created new. By doing that we ensure another
+    // port.
+    intptr_t new_fd = CreateBindListen(addr, 0, backlog, v6_only);
+    int err = errno;
+    TEMP_FAILURE_RETRY(close(fd));
+    errno = err;
+    return new_fd;
+  }
+
   if (TEMP_FAILURE_RETRY(listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
     TEMP_FAILURE_RETRY(close(fd));
     return -1;
   }
 
   Socket::SetNonBlocking(fd);
   return fd;
 }
 
 
@@ skipping 55 matching lines @@
                                        SOL_TCP,
                                        TCP_NODELAY,
                                        reinterpret_cast<char *>(&on),
                                        sizeof(on))) == 0;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)