diff options
Diffstat (limited to 'kde-frameworks/kio/files')
3 files changed, 120 insertions, 0 deletions
diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch new file mode 100644 index 000000000000..17968ff6cdb8 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.64.0-fix-ftp-proxy-settings.patch @@ -0,0 +1,39 @@ +From 04edc7738cc3dc675c3896f4a8de0851b174d4ca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven29@gmail.com> +Date: Fri, 22 Nov 2019 12:39:48 +0100 +Subject: Ftp ioslave: Fix ProxyUrls parameter passing + +Summary: +QVariant stored in mapConfig always contain QByteArray values. +So QVariant needs to be converted string before splitting to StringList + +Relates to D25432 + +Reviewers: trufanov, #frameworks + +Reviewed By: trufanov + +Subscribers: kde-frameworks-devel + +Tags: #frameworks + +Differential Revision: https://phabricator.kde.org/D25438 +--- + src/ioslaves/ftp/ftp.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp +index 8cd58c9..4266a6c 100644 +--- a/src/ioslaves/ftp/ftp.cpp ++++ b/src/ioslaves/ftp/ftp.cpp +@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u + qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user; + + m_proxyURL.clear(); +- m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QStringList()).toStringList(); ++ m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(',')); + qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls; + + if (m_host != _host || m_port != _port || +-- +cgit v1.1 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 + diff --git a/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch new file mode 100644 index 000000000000..54f9755092f2 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.64.0-fix-no-proxy-settings.patch @@ -0,0 +1,38 @@ +From 48b8cab8da5e264f233d59cf2aff2b981255f6bf Mon Sep 17 00:00:00 2001 +From: David Faure <faure@kde.org> +Date: Sat, 23 Nov 2019 20:11:21 +0100 +Subject: Repair FTP/HTTP proxy querying for the case of no proxy + +--- + src/ioslaves/ftp/ftp.cpp | 2 +- + src/ioslaves/http/http.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ioslaves/ftp/ftp.cpp b/src/ioslaves/ftp/ftp.cpp +index 4266a6c..f310871 100644 +--- a/src/ioslaves/ftp/ftp.cpp ++++ b/src/ioslaves/ftp/ftp.cpp +@@ -317,7 +317,7 @@ void FtpInternal::setHost(const QString &_host, quint16 _port, const QString &_u + qCDebug(KIO_FTP) << _host << "port=" << _port << "user=" << _user; + + m_proxyURL.clear(); +- m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(',')); ++ m_proxyUrls = q->mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts); + qCDebug(KIO_FTP) << "proxy urls:" << m_proxyUrls; + + if (m_host != _host || m_port != _port || +diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp +index aca847b..5f9cd7c 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"), QString()).toString().split(QLatin1Char(',')); ++ m_request.proxyUrls = mapConfig().value(QStringLiteral("ProxyUrls"), QString()).toString().split(QLatin1Char(','), QString::SkipEmptyParts); + qCDebug(KIO_HTTP) << "Proxy URLs:" << m_request.proxyUrls; + } + +-- +cgit v1.1 |