Add ToASCII: CheckHyphens = false

Follows whatwg/url#309 Tests web-platform-tests/wpt#5976
upa-url · May 28, 2017 · 9cbc9c0 · 9cbc9c0
1 parent 5dad8c2
commit 9cbc9c0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/url_idna.cpp b/src/url_idna.cpp
@@ -59,10 +59,15 @@ static_assert(sizeof(char16_t) == sizeof(UChar), "");
 url_result IDNToASCII(const char16_t* src, size_t src_len, simple_buffer<char16_t>& output) {
     // https://url.spec.whatwg.org/#concept-domain-to-ascii
     // http://www.unicode.org/reports/tr46/#ToASCII
-    // VerifyDnsLength = false
     static const uint32_t UIDNA_ERR_MASK = ~(uint32_t)(
-        UIDNA_ERROR_EMPTY_LABEL | UIDNA_ERROR_LABEL_TOO_LONG |
-        UIDNA_ERROR_DOMAIN_NAME_TOO_LONG
+        // VerifyDnsLength = false
+        UIDNA_ERROR_EMPTY_LABEL
+        | UIDNA_ERROR_LABEL_TOO_LONG
+        | UIDNA_ERROR_DOMAIN_NAME_TOO_LONG
+        // CheckHyphens = false
+        | UIDNA_ERROR_LEADING_HYPHEN
+        | UIDNA_ERROR_TRAILING_HYPHEN
+        | UIDNA_ERROR_HYPHEN_3_4
         );
 
     // uidna_nameToASCII uses int32_t length

diff --git a/test/tests.cpp b/test/tests.cpp
@@ -200,7 +200,7 @@ int main(int argc, char** argv)
     err |= test_from_file(run_parser_tests, "w3c-tests/urltestdata-mano.json");
 //  err |= test_from_file(run_parser_tests, "w3c-tests/urltestdata-mano-bandymai.json");
 
-    // err |= test_from_file(run_host_parser_tests, "w3c-tests/toascii.json");
+    err |= test_from_file(run_host_parser_tests, "w3c-tests/toascii.json");
 
     err |= test_from_file(run_setter_tests, "w3c-tests/setters_tests.json");