backport upstream fix: forwardsocket errors (D9249)
This commit is contained in:
parent
b3cc56d29e
commit
6d32baac40
35
0012-forward-socket-error-string-to-KTcpSocket.patch
Normal file
35
0012-forward-socket-error-string-to-KTcpSocket.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From 84f290a2659d4e8704282d186cfa3a1093bcd133 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Koller <kollix@aon.at>
|
||||
Date: Fri, 8 Dec 2017 14:37:41 +0100
|
||||
Subject: [PATCH 12/25] forward socket error string to KTcpSocket
|
||||
|
||||
KTcpSocket is a QIODevice, internally using a Qt socket - however it did
|
||||
not set the error string of itself when the internal socket
|
||||
signals some error condition. Now it does.
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D9249
|
||||
---
|
||||
src/core/ktcpsocket.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/core/ktcpsocket.cpp b/src/core/ktcpsocket.cpp
|
||||
index a3e70c4b..439e9022 100644
|
||||
--- a/src/core/ktcpsocket.cpp
|
||||
+++ b/src/core/ktcpsocket.cpp
|
||||
@@ -349,11 +349,13 @@ public:
|
||||
//private slots
|
||||
void reemitSocketError(QAbstractSocket::SocketError e)
|
||||
{
|
||||
+ q->setErrorString(sock.errorString());
|
||||
emit q->error(errorFromAbsSocket(e));
|
||||
}
|
||||
|
||||
void reemitSslErrors(const QList<QSslError> &errors)
|
||||
{
|
||||
+ q->setErrorString(sock.errorString());
|
||||
q->showSslErrors(); //H4X
|
||||
QList<KSslError> kErrors;
|
||||
foreach (const QSslError &e, errors) {
|
||||
--
|
||||
2.14.3
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
Name: kf5-%{framework}
|
||||
Version: 5.41.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction
|
||||
|
||||
License: GPLv2+ and MIT and BSD
|
||||
@ -18,6 +18,7 @@ URL: https://cgit.kde.org/%{framework}.git
|
||||
Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
|
||||
|
||||
## upstream patches
|
||||
Patch12: 0012-forward-socket-error-string-to-KTcpSocket.patch
|
||||
|
||||
## upstreamable patches
|
||||
# revert part of https://cgit.kde.org/kio.git/commit/src/core/slave.cpp?id=e2a4517f099d809bd53c6a10769ebfddc0f28a8b
|
||||
@ -275,6 +276,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Dec 19 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.41.0-3
|
||||
- backport upstream fix: forwardsocket errors (D9249)
|
||||
|
||||
* Thu Dec 07 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.41.0-2
|
||||
- cleanup
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user