diff options
Diffstat (limited to 'kde-frameworks/kdelibs/files/kdelibs-4.14.29-sanitize-url.patch')
-rw-r--r-- | kde-frameworks/kdelibs/files/kdelibs-4.14.29-sanitize-url.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.29-sanitize-url.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.29-sanitize-url.patch deleted file mode 100644 index d063f8b598d8..000000000000 --- a/kde-frameworks/kdelibs/files/kdelibs-4.14.29-sanitize-url.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 1804c2fde7bf4e432c6cf5bb8cce5701c7010559 -Author: Albert Astals Cid <aacid@kde.org> -Date: Tue Feb 28 19:08:50 2017 +0100 - - Sanitize URLs before passing them to FindProxyForURL - - Remove user/password information - For https: remove path and query - - Backport from kio f9d0cb47cf94e209f6171ac0e8d774e68156a6e4 - -diff --git a/kio/misc/kpac/script.cpp b/kio/misc/kpac/script.cpp -index a595301307..9ab360a0b5 100644 ---- a/kio/misc/kpac/script.cpp -+++ b/kio/misc/kpac/script.cpp -@@ -754,9 +754,16 @@ namespace KPAC - } - } - -+ KUrl cleanUrl = url; -+ cleanUrl.setUserInfo(QString()); -+ if (cleanUrl.scheme().toLower() == QLatin1String("https")) { -+ cleanUrl.setPath(QString()); -+ cleanUrl.setQuery(QString()); -+ } -+ - QScriptValueList args; -- args << url.url(); -- args << url.host(); -+ args << cleanUrl.url(); -+ args << cleanUrl.host(); - - QScriptValue result = func.call(QScriptValue(), args); - if (result.isError()) { |