diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-12-19 10:44:54 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-12-19 10:45:23 +0100 |
commit | df7bb09fcfce8b75127b6c5178c650f48d516cd6 (patch) | |
tree | 560dfd533c0e13d870865606367d155023f951bf /kde-frameworks/kio/files | |
parent | media-sound/sound-visualiser: fixed 4.0.1 (diff) | |
download | gentoo-df7bb09fcfce8b75127b6c5178c650f48d516cd6.tar.gz gentoo-df7bb09fcfce8b75127b6c5178c650f48d516cd6.tar.bz2 gentoo-df7bb09fcfce8b75127b6c5178c650f48d516cd6.zip |
kde-frameworks/kio: Fix HTTP proxy settings
Upstream commit c0ae03d14b0e58f2d3a23680b7b63c9fe46bdce6
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=414346
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kio/files')
-rw-r--r-- | kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch new file mode 100644 index 000000000000..2bde0a85d680 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.64.0-fix-http-proxy-settings.patch @@ -0,0 +1,43 @@ +From c0ae03d14b0e58f2d3a23680b7b63c9fe46bdce6 Mon Sep 17 00:00:00 2001 +From: Alexander Trufanov <trufanovan@gmail.com> +Date: Thu, 21 Nov 2019 14:25:02 +0300 +Subject: Fix HTTP proxy settings + +Summary: +After SlaveBase::config() was replaced with SlaveBase::mapConfig() +the reading of "ProxyUrls" value had beed broken as QVariant with +type QByteArray can't be directly converted to QStringList. +It should be converted to QString and splitted. + +Reviewers: #frameworks, meven + +Reviewed By: meven + +Subscribers: meven, kde-frameworks-devel + +Tags: #frameworks + +BUG: 414346 +FIXED-IN: 5.65 + +Differential Revision: https://phabricator.kde.org/D25432 +--- + src/ioslaves/http/http.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp +index 2b9ca9a..aca847b 100644 +--- a/src/ioslaves/http/http.cpp ++++ b/src/ioslaves/http/http.cpp +@@ -2161,7 +2161,7 @@ bool HTTPProtocol::httpOpenConnection() + + // Get proxy information... + if (m_request.proxyUrls.isEmpty()) { +- m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QStringList()).toStringList(); ++ m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(',')); + qCDebug(KIO_HTTP) << "Proxy URLs:" << m_request.proxyUrls; + } + +-- +cgit v1.1 + |