diff options
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/page/Connection.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/KURL.cpp | 7 | ||||
| -rw-r--r-- | WebCore/platform/android/PackageNotifier.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/WebCore/page/Connection.cpp b/WebCore/page/Connection.cpp index ffbb838..1031df3 100644 --- a/WebCore/page/Connection.cpp +++ b/WebCore/page/Connection.cpp @@ -36,4 +36,4 @@ Connection::ConnectionType Connection::type() const return networkStateNotifier().type(); } -};
\ No newline at end of file +}; diff --git a/WebCore/platform/KURL.cpp b/WebCore/platform/KURL.cpp index 79bb6e2..e790cc0 100644 --- a/WebCore/platform/KURL.cpp +++ b/WebCore/platform/KURL.cpp @@ -1287,6 +1287,13 @@ 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); diff --git a/WebCore/platform/android/PackageNotifier.h b/WebCore/platform/android/PackageNotifier.h index ad44bc7..d9b4fd4 100644 --- a/WebCore/platform/android/PackageNotifier.h +++ b/WebCore/platform/android/PackageNotifier.h @@ -66,4 +66,4 @@ PackageNotifier& packageNotifier(); #endif -#endif // PackageNotifier_h
\ No newline at end of file +#endif // PackageNotifier_h |