OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6ebda80
)
Revert "Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/.""
author
Steve Block
<steveblock@google.com>
Sat, 4 Sep 2010 19:46:56 +0000
(20:46 +0100)
committer
Steve Block
<steveblock@google.com>
Sat, 4 Sep 2010 19:52:11 +0000
(20:52 +0100)
This change broke LayoutTest fast/url/ipv4.html
This reverts commit
ff93a851c578d0b570c84b3a83a41a4930e7107c
.
Change-Id: Ic27602be9fdd855fbc1517deed9e7e9737f5b9b5
WebCore/platform/KURL.cpp
patch
|
blob
|
history
diff --git
a/WebCore/platform/KURL.cpp
b/WebCore/platform/KURL.cpp
index
380cb41
..
16b84b5
100644
(file)
--- 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);