Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1940)

Unified Diff: pkg/http_multi_server/lib/http_multi_server.dart

Issue 433593002: Remove the workaround for issue 19815 in http_multi_server. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/http_multi_server/CHANGELOG.md ('k') | pkg/http_multi_server/lib/src/utils.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/http_multi_server/lib/http_multi_server.dart
diff --git a/pkg/http_multi_server/lib/http_multi_server.dart b/pkg/http_multi_server/lib/http_multi_server.dart
index da128885fafc3717bc4286aba9dc8ad6f4721d2f..c055367dc89fad727b2a45e21536a609d0e9a182 100644
--- a/pkg/http_multi_server/lib/http_multi_server.dart
+++ b/pkg/http_multi_server/lib/http_multi_server.dart
@@ -99,15 +99,20 @@ class HttpMultiServer extends StreamView<HttpRequest> implements HttpServer {
/// [HttpServer.bindSecure].
static Future<HttpServer> _loopback(int port,
Future<HttpServer> bind(InternetAddress address, int port)) {
- return bind(InternetAddress.LOOPBACK_IP_V4, port).then((v4Server) {
+ return Future.wait([
+ supportsIpV6,
+ bind(InternetAddress.LOOPBACK_IP_V4, port)
+ ]).then((results) {
+ var supportsIpV6 = results[0];
+ var v4Server = results[1];
+
+ if (!supportsIpV6) return v4Server;
+
// Reuse the IPv4 server's port so that if [port] is 0, both servers use
// the same ephemeral port.
return bind(InternetAddress.LOOPBACK_IP_V6, v4Server.port)
- .then((v6Server) => new HttpMultiServer([v4Server, v6Server]))
- .catchError((error) {
- // If we fail to bind to IPv6, just use IPv4.
- if (error is SocketException) return v4Server;
- throw error;
+ .then((v6Server) {
+ return new HttpMultiServer([v4Server, v6Server]);
});
});
}
« no previous file with comments | « pkg/http_multi_server/CHANGELOG.md ('k') | pkg/http_multi_server/lib/src/utils.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698