Version 1.2.0-dev.5.12
merge r32796 by applying:
https://codereview.chromium.org/168283009/
svn merge -c 32670 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 32798 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 32805 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
Reverts:
svn merge -c -32716 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c -32729 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
R=kasperl@google.com
Review URL: https://codereview.chromium.org//173523002
git-svn-id: http://dart.googlecode.com/svn/trunk@32844 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/bin/socket_android.cc b/runtime/bin/socket_android.cc
index 6a2d6ce..0ab6af4 100644
--- a/runtime/bin/socket_android.cc
+++ b/runtime/bin/socket_android.cc
@@ -238,22 +238,16 @@
memset(&hints, 0, sizeof(hints));
hints.ai_family = SocketAddress::FromType(type);
hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG);
+ hints.ai_flags = 0;
hints.ai_protocol = IPPROTO_TCP;
struct addrinfo* info = NULL;
int status = getaddrinfo(host, 0, &hints, &info);
if (status != 0) {
- // We failed, try without AI_ADDRCONFIG. This can happen when looking up
- // e.g. '::1', when there are no IPv6 addresses.
- hints.ai_flags = AI_V4MAPPED;
- status = getaddrinfo(host, 0, &hints, &info);
- if (status != 0) {
- ASSERT(*os_error == NULL);
- *os_error = new OSError(status,
- gai_strerror(status),
- OSError::kGetAddressInfo);
- return NULL;
- }
+ ASSERT(*os_error == NULL);
+ *os_error = new OSError(status,
+ gai_strerror(status),
+ OSError::kGetAddressInfo);
+ return NULL;
}
intptr_t count = 0;
for (struct addrinfo* c = info; c != NULL; c = c->ai_next) {
diff --git a/runtime/bin/socket_linux.cc b/runtime/bin/socket_linux.cc
index 693e5c3..08d8fe1 100644
--- a/runtime/bin/socket_linux.cc
+++ b/runtime/bin/socket_linux.cc
@@ -239,22 +239,16 @@
memset(&hints, 0, sizeof(hints));
hints.ai_family = SocketAddress::FromType(type);
hints.ai_socktype = SOCK_STREAM;
- hints.ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG);
+ hints.ai_flags = 0;
hints.ai_protocol = IPPROTO_TCP;
struct addrinfo* info = NULL;
int status = getaddrinfo(host, 0, &hints, &info);
if (status != 0) {
- // We failed, try without AI_ADDRCONFIG. This can happen when looking up
- // e.g. '::1', when there are no global IPv6 addresses.
- hints.ai_flags = AI_V4MAPPED;
- status = getaddrinfo(host, 0, &hints, &info);
- if (status != 0) {
- ASSERT(*os_error == NULL);
- *os_error = new OSError(status,
- gai_strerror(status),
- OSError::kGetAddressInfo);
- return NULL;
- }
+ ASSERT(*os_error == NULL);
+ *os_error = new OSError(status,
+ gai_strerror(status),
+ OSError::kGetAddressInfo);
+ return NULL;
}
intptr_t count = 0;
for (struct addrinfo* c = info; c != NULL; c = c->ai_next) {
diff --git a/tests/html/html.status b/tests/html/html.status
index c9d779d..5688fe5 100644
--- a/tests/html/html.status
+++ b/tests/html/html.status
@@ -35,9 +35,6 @@
async_test: Fail # Background timers not implemented.
keyboard_event_test: Fail # Issue 13902
isolates_test: Fail # Issue 13921
-indexeddb_5_test: RuntimeError # Issue 16657 Chrome 33 regression)
-fileapi_test/fileEntry: RuntimeError # Issue 16657 (Chrome 33 regression)
-audiocontext_test/functional: RuntimeError # Issue 16657 (Chrome 33 regression)
[ $compiler == none && $runtime == drt && $system == windows ]
worker_test/functional: Pass, Crash # Issue 9929.
diff --git a/tests/standalone/standalone.status b/tests/standalone/standalone.status
index 4f45880..97c3f5e 100644
--- a/tests/standalone/standalone.status
+++ b/tests/standalone/standalone.status
@@ -100,6 +100,9 @@
# Skip until we stabilize language tests.
*: Skip
+[ $arch == arm ]
+io/internet_address_test: Fail # localhost is an Unknown name?
+
[ $arch == simarm ]
out_of_memory_test: Skip # passes on Mac, crashes on Linux
oom_error_stacktrace_test: Skip # Fails on Linux
diff --git a/tools/VERSION b/tools/VERSION
index 86c217c..e775b01 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 2
PATCH 0
PRERELEASE 5
-PRERELEASE_PATCH 11
+PRERELEASE_PATCH 12
