Commit e1d85012 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

2011-02-16 Aparna Nandyal <aparna.nand@wipro.com>

        Reviewed by Andreas Kling.

        [Qt] QWebFrame: When a relative url is loaded then it will make it absolute internally, however this strips out any query/fragments
        https://bugs.webkit.org/show_bug.cgi?id=29424

        ensureAbsoluteUrl function was stripping the query and the
        fragment part of the url. Corrected this.

        * Api/qwebframe.cpp:
        (ensureAbsoluteUrl):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78688 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 54b4eba0
......@@ -732,7 +732,15 @@ static inline QUrl ensureAbsoluteUrl(const QUrl &url)
if (!url.isRelative())
return url;
return QUrl::fromLocalFile(QFileInfo(url.toLocalFile()).absoluteFilePath());
// This contains the URL with absolute path but without
// the query and the fragment part.
QUrl baseUrl = QUrl::fromLocalFile(QFileInfo(url.toLocalFile()).absoluteFilePath());
// The path is removed so the query and the fragment parts are there.
QString pathRemoved = url.toString(QUrl::RemovePath);
QUrl toResolve(pathRemoved);
return baseUrl.resolved(toResolve);
}
/*!
......
2011-02-16 Aparna Nandyal <aparna.nand@wipro.com>
Reviewed by Andreas Kling.
[Qt] QWebFrame: When a relative url is loaded then it will make it absolute internally, however this strips out any query/fragments
https://bugs.webkit.org/show_bug.cgi?id=29424
ensureAbsoluteUrl function was stripping the query and the
fragment part of the url. Corrected this.
* Api/qwebframe.cpp:
(ensureAbsoluteUrl):
2011-02-15 Csaba Osztrogonác <ossy@webkit.org>
 
Unreviewed.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment