summaryrefslogtreecommitdiffstats
path: root/WebCore/platform
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-09-04 20:46:56 +0100
committerSteve Block <steveblock@google.com>2010-09-04 20:52:11 +0100
commit7797f5cbd60d3a45ba6029508928d7cc7d52849f (patch)
treed20a63f4af00a7372691b539163010332cc83945 /WebCore/platform
parent6ebda80d6cee9dff24ad951261289ba2c85a8d95 (diff)
downloadexternal_webkit-7797f5cbd60d3a45ba6029508928d7cc7d52849f.zip
external_webkit-7797f5cbd60d3a45ba6029508928d7cc7d52849f.tar.gz
external_webkit-7797f5cbd60d3a45ba6029508928d7cc7d52849f.tar.bz2
Revert "Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/.""
This change broke LayoutTest fast/url/ipv4.html This reverts commit ff93a851c578d0b570c84b3a83a41a4930e7107c. Change-Id: Ic27602be9fdd855fbc1517deed9e7e9737f5b9b5
Diffstat (limited to 'WebCore/platform')
-rw-r--r--WebCore/platform/KURL.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/WebCore/platform/KURL.cpp b/WebCore/platform/KURL.cpp
index 380cb41..16b84b5 100644
--- a/WebCore/platform/KURL.cpp
+++ b/WebCore/platform/KURL.cpp
@@ -1295,13 +1295,6 @@ void KURL::parse(const char* url, const String* originalString)
if (m_protocolInHTTPFamily && hierarchical && pathEnd == pathStart)
*p++ = '/';
-#if PLATFORM(ANDROID)
- // Remove any trailing '.' from base, in order to conform to RFC 3986 section 5.4
- if (p[-1] == '.') {
- p--;
- }
-#endif /* PLATFORM(ANDROID) */
-
// add path, escaping bad characters
if (!hierarchical || !hasSlashDotOrDotDot(url))
appendEscapingBadChars(p, url + pathStart, pathEnd - pathStart);