Modified: trunk/Source/WebCore/platform/URLParser.cpp (205520 => 205521)
--- trunk/Source/WebCore/platform/URLParser.cpp 2016-09-06 23:22:01 UTC (rev 205520)
+++ trunk/Source/WebCore/platform/URLParser.cpp 2016-09-06 23:36:36 UTC (rev 205521)
@@ -28,6 +28,7 @@
#include "Logging.h"
#include <array>
+#include <unicode/uidna.h>
#include <wtf/HashMap.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/StringBuilder.h>
@@ -450,7 +451,8 @@
case State::SchemeEndCheckForSlashes:
LOG_STATE("SchemeEndCheckForSlashes");
if (*c == '/') {
- m_buffer.append('/');
+ m_buffer.append("//");
+ m_url.m_userStart = m_buffer.length();
state = State::PathOrAuthority;
++c;
} else {
@@ -1269,11 +1271,44 @@
return output.toStringPreserveCapacity();
}
+static bool containsOnlyASCII(const String& string)
+{
+ if (string.is8Bit())
+ return charactersAreAllASCII(string.characters8(), string.length());
+ return charactersAreAllASCII(string.characters16(), string.length());
+}
+
static Optional<String> domainToASCII(const String& domain)
{
- // FIXME: Implement correctly
- CString utf8 = domain.utf8();
- return String(utf8.data(), utf8.length());
+ const unsigned hostnameBufferLength = 2048;
+
+ if (containsOnlyASCII(domain)) {
+ if (domain.is8Bit())
+ return domain;
+ Vector<LChar, hostnameBufferLength> buffer;
+ size_t length = domain.length();
+ buffer.reserveInitialCapacity(length);
+ for (size_t i = 0; i < length; ++i)
+ buffer.append(domain[i]);
+ return String(buffer.data(), length);
+ }
+
+ UChar hostnameBuffer[hostnameBufferLength];
+ UErrorCode error = U_ZERO_ERROR;
+
+ int32_t numCharactersConverted = uidna_IDNToASCII(StringView(domain).upconvertedCharacters(), domain.length(), hostnameBuffer, hostnameBufferLength, UIDNA_ALLOW_UNASSIGNED, nullptr, &error);
+
+ if (error == U_ZERO_ERROR) {
+ LChar buffer[hostnameBufferLength];
+ for (int32_t i = 0; i < numCharactersConverted; ++i) {
+ ASSERT(isASCII(hostnameBuffer[i]));
+ buffer[i] = hostnameBuffer[i];
+ }
+ return String(buffer, numCharactersConverted);
+ }
+
+ // FIXME: Check for U_BUFFER_OVERFLOW_ERROR and retry with an allocated buffer.
+ return Nullopt;
}
static bool hasInvalidDomainCharacter(const String& asciiDomain)
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp (205520 => 205521)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-06 23:22:01 UTC (rev 205520)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp 2016-09-06 23:36:36 UTC (rev 205521)
@@ -84,6 +84,16 @@
EXPECT_TRUE(URLParser::allValuesEqual(url, oldURL));
}
+template<size_t length>
+static String wideString(const wchar_t (&url)[length])
+{
+ StringBuilder builder;
+ builder.reserveCapacity(length - 1);
+ for (size_t i = 0; i < length - 1; ++i)
+ builder.append(url[i]);
+ return builder.toString();
+}
+
TEST_F(URLParserTest, Basic)
{
checkURL("http://user:p...@webkit.org:123/path?query#fragment", {"http", "user", "pass", "webkit.org", 123, "/path", "query", "fragment", "http://user:p...@webkit.org:123/path?query#fragment"});
@@ -209,6 +219,8 @@
checkRelativeURL("//whatwg.org/index.html", "https://www.webkit.org/path", {"https", "", "", "whatwg.org", 0, "/index.html", "", "", "https://whatwg.org/index.html"});
checkRelativeURL("http://example\t.\norg", "http://example.org/foo/bar", {"http", "", "", "example.org", 0, "/", "", "", "http://example.org/"});
checkRelativeURL("test", "file:///path1/path2", {"file", "", "", "", 0, "/path1/test", "", "", "file:///path1/test"});
+ checkRelativeURL(wideString(L"http://www.foo。bar.com"), "http://other.com/", {"http", "", "", "www.foo.bar.com", 0, "/", "", "", "http://www.foo.bar.com/"});
+ checkRelativeURL(wideString(L"sc://ñ.test/"), "about:blank", {"sc", "", "", "xn--ida.test", 0, "/", "", "", "sc://xn--ida.test/"});
}
static void checkURLDifferences(const String& urlString, const ExpectedParts& partsNew, const ExpectedParts& partsOld)
@@ -351,6 +363,9 @@
{"http", "", "", "host%73", 0, "/", "", "", "http://host%73/"});
// URLParser matches Chrome and the spec, but not URL::parse or Firefox.
+ checkURLDifferences(wideString(L"http://０Ｘｃ０．０２５０．０１"),
+ {"http", "", "", "192.168.0.1", 0, "/", "", "", "http://192.168.0.1/"},
+ {"http", "", "", "0xc0.0250.01", 0, "/", "", "", "http://0xc0.0250.01/"});
checkURLDifferences("http://host/path%2e.%2E",
{"http", "", "", "host", 0, "/path...", "", "", "http://host/path..."},
{"http", "", "", "host", 0, "/path%2e.%2E", "", "", "http://host/path%2e.%2E"});
