Changeset 207303 in webkit

Timestamp:

Oct 13, 2016 1:03:39 PM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r207268. rdar://problem/28756748

Location:

tags/Safari-603.1.9/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/URLParser.cpp (modified) (10 diffs)
• platform/URLParser.h (modified) (1 diff)

tags/Safari-603.1.9/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-13  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r207268. rdar://problem/28756748
+
+    2016-10-12  Alex Christensen  <achristensen@webkit.org>
+
+            Mail needs nonspecial URLs to keep case in host and not have slash after host
+            https://bugs.webkit.org/show_bug.cgi?id=163373
+
+            Reviewed by Saam Barati.
+
+            Mail uses urls like scheme://HoSt which were not changed when canonicalized
+            before enabling the URLParser but now are canonicalized to scheme://host/
+            I manually verified this fixes the issue.
+            This should be reverted once Mail will accept modern canonicalized URLs.
+
+            * platform/URLParser.cpp:
+            (WebCore::URLParser::parse):
+            (WebCore::URLParser::parseHostAndPort):
+            * platform/URLParser.h:
+            If the application is mail and the scheme is nonspecial, don't make the host lower case and don't add a slash after the host.
+
 2016-10-12  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
 

tags/Safari-603.1.9/Source/WebCore/platform/URLParser.cpp

@@ -28 +28 @@
 
 #include "Logging.h"
+#include "RuntimeApplicationChecks.h"
 #include <array>
 #include <unicode/uidna.h>
@@ -1128 +1129 @@
 void URLParser::parse(const CharacterType* input, const unsigned length, const URL& base, const TextEncoding& encoding)
 {
+#if PLATFORM(MAC)
+    static bool isMail = MacApplication::isAppleMail();
+#else
+    static bool isMail = false;
+#endif
+    
     URL_PARSER_LOG("Parsing URL <%s> base <%s> encoding <%s>", String(input, length).utf8().data(), base.string().utf8().data(), encoding.name());
     m_url = { };
@@ -1454 +1461 @@
                         m_url.m_userEnd = currentPosition(authorityOrHostBegin);
                         m_url.m_passwordEnd = m_url.m_userEnd;
-                        if (!parseHostAndPort(iterator)) {
+                        if (!parseHostAndPort(iterator, isMail)) {
                             failure();
                             return;
@@ -1476 +1483 @@
                 LOG_STATE("Host");
                 if (*c == '/' || *c == '?' || *c == '#') {
-                    if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
+                    if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c), isMail)) {
                         failure();
                         return;
@@ -1647 +1654 @@
                         break;
                     }
-                    if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
+                    if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c), isMail)) {
                         failure();
                         return;
@@ -1867 +1874 @@
             m_url.m_portEnd = m_url.m_userStart;
             m_url.m_pathEnd = m_url.m_userStart + 2;
-        } else if (!parseHostAndPort(authorityOrHostBegin)) {
+        } else if (!parseHostAndPort(authorityOrHostBegin, isMail)) {
             failure();
             return;
         } else {
-            syntaxViolation(c);
-            appendToASCIIBuffer('/');
-            m_url.m_pathEnd = m_url.m_portEnd + 1;
+            if (LIKELY(!isMail || m_urlIsSpecial)) {
+                syntaxViolation(c);
+                appendToASCIIBuffer('/');
+                m_url.m_pathEnd = m_url.m_portEnd + 1;
+            } else
+                m_url.m_pathEnd = m_url.m_portEnd;
         }
         m_url.m_pathAfterLastSlash = m_url.m_pathEnd;
@@ -1881 +1891 @@
     case State::Host:
         LOG_FINAL_STATE("Host");
-        if (!parseHostAndPort(authorityOrHostBegin)) {
+        if (!parseHostAndPort(authorityOrHostBegin, isMail)) {
             failure();
             return;
         }
-        syntaxViolation(c);
-        appendToASCIIBuffer('/');
-        m_url.m_pathEnd = m_url.m_portEnd + 1;
+        if (LIKELY(!isMail || m_urlIsSpecial)) {
+            syntaxViolation(c);
+            appendToASCIIBuffer('/');
+            m_url.m_pathEnd = m_url.m_portEnd + 1;
+        } else
+            m_url.m_pathEnd = m_url.m_portEnd;
         m_url.m_pathAfterLastSlash = m_url.m_pathEnd;
         m_url.m_queryEnd = m_url.m_pathEnd;
@@ -1941 +1954 @@
         }
 
-        if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c))) {
+        if (!parseHostAndPort(CodePointIterator<CharacterType>(authorityOrHostBegin, c), isMail)) {
             failure();
             return;
@@ -2556 +2569 @@
 
 template<typename CharacterType>
-bool URLParser::parseHostAndPort(CodePointIterator<CharacterType> iterator)
+bool URLParser::parseHostAndPort(CodePointIterator<CharacterType> iterator, const bool& isMail)
 {
     if (iterator.atEnd())
@@ -2606 +2619 @@
         for (; hostIterator != iterator; ++hostIterator) {
             if (LIKELY(!isTabOrNewline(*hostIterator))) {
-                if (UNLIKELY(isASCIIUpper(*hostIterator)))
-                    syntaxViolation(hostIterator);
-                appendToASCIIBuffer(toASCIILower(*hostIterator));
+                if (UNLIKELY(isMail && !m_urlIsSpecial))
+                    appendToASCIIBuffer(*hostIterator);
+                else {
+                    if (UNLIKELY(isASCIIUpper(*hostIterator)))
+                        syntaxViolation(hostIterator);
+                    appendToASCIIBuffer(toASCIILower(*hostIterator));
+                }
             } else
                 syntaxViolation(hostIterator);

tags/Safari-603.1.9/Source/WebCore/platform/URLParser.h

@@ -61 +61 @@
     template<typename CharacterType> void parse(const CharacterType*, const unsigned length, const URL&, const TextEncoding&);
     template<typename CharacterType> void parseAuthority(CodePointIterator<CharacterType>);
-    template<typename CharacterType> bool parseHostAndPort(CodePointIterator<CharacterType>);
+    template<typename CharacterType> bool parseHostAndPort(CodePointIterator<CharacterType>, const bool& isMail);
     template<typename CharacterType> bool parsePort(CodePointIterator<CharacterType>&);