Title: [230242] branches/safari-605-branch
Revision
230242
Author
jmarc...@apple.com
Date
2018-04-03 20:27:53 -0700 (Tue, 03 Apr 2018)

Log Message

Cherry-pick r230146. rdar://problem/39155245

    Show punycode if URL contains hyphen character
    https://bugs.webkit.org/show_bug.cgi?id=184221
    <rdar://problem/38044633>

    Reviewed by Darin Adler.

    Source/WebCore:

    Revise our "lookalike character" logic to include the hyphen,
    non-breaking hyphen, and minus sign.

    Test: fast/url/host.html

    * platform/mac/WebCoreNSURLExtras.mm:
    (WebCore::isLookalikeCharacter):

    LayoutTests:

    * fast/url/host-expected.txt:
    * fast/url/host.html:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230146 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (230241 => 230242)


--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-04-04 03:27:50 UTC (rev 230241)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-04-04 03:27:53 UTC (rev 230242)
@@ -1,5 +1,44 @@
 2018-04-03  Jason Marcell  <jmarc...@apple.com>
 
+        Cherry-pick r230146. rdar://problem/39155245
+
+    Show punycode if URL contains hyphen character
+    https://bugs.webkit.org/show_bug.cgi?id=184221
+    <rdar://problem/38044633>
+    
+    Reviewed by Darin Adler.
+    
+    Source/WebCore:
+    
+    Revise our "lookalike character" logic to include the hyphen,
+    non-breaking hyphen, and minus sign.
+    
+    Test: fast/url/host.html
+    
+    * platform/mac/WebCoreNSURLExtras.mm:
+    (WebCore::isLookalikeCharacter):
+    
+    LayoutTests:
+    
+    * fast/url/host-expected.txt:
+    * fast/url/host.html:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230146 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-03-31  Brent Fulgham  <bfulg...@apple.com>
+
+            Show punycode if URL contains hyphen character
+            https://bugs.webkit.org/show_bug.cgi?id=184221
+            <rdar://problem/38044633>
+
+            Reviewed by Darin Adler.
+
+            * fast/url/host-expected.txt:
+            * fast/url/host.html:
+
+2018-04-03  Jason Marcell  <jmarc...@apple.com>
+
         Cherry-pick r230052. rdar://problem/39155251
 
     WebSocket cookie incorrectly stored

Modified: branches/safari-605-branch/LayoutTests/fast/url/host-expected.txt (230241 => 230242)


--- branches/safari-605-branch/LayoutTests/fast/url/host-expected.txt	2018-04-04 03:27:50 UTC (rev 230241)
+++ branches/safari-605-branch/LayoutTests/fast/url/host-expected.txt	2018-04-04 03:27:53 UTC (rev 230242)
@@ -44,6 +44,9 @@
 PASS canonicalize('http://.:./') is 'http://.:./'
 PASS canonicalize('http://////@google.com//') is 'http://google.com//'
 PASS canonicalize('http://@google.com/') is 'http://google.com/'
+PASS canonicalize('http://quip‐apple.com/') is 'http://xn--quipapple-y79d.com/'
+PASS canonicalize('http://quip‑apple.com/') is 'http://xn--quipapple-y79d.com/'
+PASS canonicalize('http://quip−apple.com/') is 'http://xn--quipapple-tf4e.com/'
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: branches/safari-605-branch/LayoutTests/fast/url/host.html (230241 => 230242)


--- branches/safari-605-branch/LayoutTests/fast/url/host.html	2018-04-04 03:27:50 UTC (rev 230241)
+++ branches/safari-605-branch/LayoutTests/fast/url/host.html	2018-04-04 03:27:53 UTC (rev 230242)
@@ -84,7 +84,10 @@
   ["xxxx:","xxxx"],
   [".:.",".:."],
   ["////@google.com/","google.com/"],
-  ["@google.com","google.com"]
+  ["@google.com","google.com"],
+  ["quip\u2010apple.com", "xn--quipapple-y79d.com"],
+  ["quip\u2011apple.com", "xn--quipapple-y79d.com"],
+  ["quip\u2212apple.com", "xn--quipapple-tf4e.com"]
 ];
 
 for (var i = 0; i < cases.length; ++i) {

Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (230241 => 230242)


--- branches/safari-605-branch/Source/WebCore/ChangeLog	2018-04-04 03:27:50 UTC (rev 230241)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog	2018-04-04 03:27:53 UTC (rev 230242)
@@ -1,5 +1,49 @@
 2018-04-03  Jason Marcell  <jmarc...@apple.com>
 
+        Cherry-pick r230146. rdar://problem/39155245
+
+    Show punycode if URL contains hyphen character
+    https://bugs.webkit.org/show_bug.cgi?id=184221
+    <rdar://problem/38044633>
+    
+    Reviewed by Darin Adler.
+    
+    Source/WebCore:
+    
+    Revise our "lookalike character" logic to include the hyphen,
+    non-breaking hyphen, and minus sign.
+    
+    Test: fast/url/host.html
+    
+    * platform/mac/WebCoreNSURLExtras.mm:
+    (WebCore::isLookalikeCharacter):
+    
+    LayoutTests:
+    
+    * fast/url/host-expected.txt:
+    * fast/url/host.html:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230146 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-03-31  Brent Fulgham  <bfulg...@apple.com>
+
+            Show punycode if URL contains hyphen character
+            https://bugs.webkit.org/show_bug.cgi?id=184221
+            <rdar://problem/38044633>
+
+            Reviewed by Darin Adler.
+
+            Revise our "lookalike character" logic to include the hyphen,
+            non-breaking hyphen, and minus sign.
+
+            Test: fast/url/host.html
+
+            * platform/mac/WebCoreNSURLExtras.mm:
+            (WebCore::isLookalikeCharacter):
+
+2018-04-03  Jason Marcell  <jmarc...@apple.com>
+
         Cherry-pick r230102. rdar://problem/38154594
 
     A stack overflow in the parsing of a builtin (called by createExecutable) cause a crash instead of a catchable js exception

Modified: branches/safari-605-branch/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm (230241 => 230242)


--- branches/safari-605-branch/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm	2018-04-04 03:27:50 UTC (rev 230241)
+++ branches/safari-605-branch/Source/WebCore/platform/mac/WebCoreNSURLExtras.mm	2018-04-04 03:27:53 UTC (rev 230242)
@@ -147,6 +147,8 @@
         case 0x1D20: /* LATIN LETTER SMALL CAPITAL V */
         case 0x1D21: /* LATIN LETTER SMALL CAPITAL W */
         case 0x1D22: /* LATIN LETTER SMALL CAPITAL Z */
+        case 0x2010: /* HYPHEN */
+        case 0x2011: /* NON-BREAKING HYPHEN */
         case 0x2024: /* ONE DOT LEADER */
         case 0x2027: /* HYPHENATION POINT */
         case 0x2039: /* SINGLE LEFT-POINTING ANGLE QUOTATION MARK */
@@ -167,6 +169,7 @@
         case 0x215D: /* VULGAR FRACTION FIVE EIGHTHS */
         case 0x215E: /* VULGAR FRACTION SEVEN EIGHTHS */
         case 0x215F: /* FRACTION NUMERATOR ONE */
+        case 0x2212: /* MINUS SIGN */
         case 0x2215: /* DIVISION SLASH */
         case 0x2216: /* SET MINUS */
         case 0x2236: /* RATIO */
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to