Changeset 30781 in webkit

Timestamp:

Mar 4, 2008, 6:09:04 PM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Darin Adler.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17676 <rdar://problem/5781091> REGRESSION (r30240-r30267): href attribute values with non-ASCII characters in the host part do not work

Test: fast/encoding/url-host-name-non-ascii.html

• platform/KURL.cpp: (WebCore::appendEncodedHostname): Added an early return in the all-ASCII case to avoid copying the host name twice and corrected the error checking after calling uidna_IDNToASCII().

LayoutTests:

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17676 <rdar://problem/5781091> REGRESSION (r30240-r30267): href attribute values with non-ASCII characters in the host part do not work

• fast/encoding/url-host-name-non-ascii-expected.txt: Added.
• fast/encoding/url-host-name-non-ascii.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/encoding/url-host-name-non-ascii-expected.txt (added)
• LayoutTests/fast/encoding/url-host-name-non-ascii.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/KURL.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-04  Dan Bernstein  <mitz@apple.com>
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17676
+          <rdar://problem/5781091> REGRESSION (r30240-r30267): href attribute values with non-ASCII characters in the host part do not work
+
+        * fast/encoding/url-host-name-non-ascii-expected.txt: Added.
+        * fast/encoding/url-host-name-non-ascii.html: Added.
+
 2008-03-04  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-04  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17676
+          <rdar://problem/5781091> REGRESSION (r30240-r30267): href attribute values with non-ASCII characters in the host part do not work
+
+        Test: fast/encoding/url-host-name-non-ascii.html
+
+        * platform/KURL.cpp:
+        (WebCore::appendEncodedHostname): Added an early return in the all-ASCII
+        case to avoid copying the host name twice and corrected the error
+        checking after calling uidna_IDNToASCII().
+
 2008-03-04  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/platform/KURL.cpp

@@ -1325 +1325 @@
     const unsigned hostnameBufferLength = 2048;
 
-    if (strLen > hostnameBufferLength || charactersAreAllASCII(str, strLen))
+    if (strLen > hostnameBufferLength || charactersAreAllASCII(str, strLen)) {
         buffer.append(str, strLen);
+        return;
+    }
 
 #if USE(ICU_UNICODE)
@@ -1333 +1335 @@
     int32_t numCharactersConverted = uidna_IDNToASCII(str, strLen, hostnameBuffer,
         hostnameBufferLength, UIDNA_ALLOW_UNASSIGNED, 0, &error);
-    if (error != U_ZERO_ERROR)
+    if (error == U_ZERO_ERROR)
         buffer.append(hostnameBuffer, numCharactersConverted);
 #elif USE(QT4_UNICODE)