summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2013-10-15 00:00:00 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2013-10-15 00:00:00 (GMT)
commit7f3f9d25fe96e2ac6331402cfc102dda6cac402d (patch)
tree3ed6947d4b1c9ccae0fdce987ec82e58df6a726a
parentd8523c323d1167f0c066581464a942b2925179bf (diff)
downloadlibcalendaring-7f3f9d25fe96e2ac6331402cfc102dda6cac402d.tar.gz
Added missing error mapping for SslHandshakeFailedError.dev/kimaploop
Without this segmentation faults occur. kdelibs patch ddc33b85e27ab18e84a0183dc35bec3dee3dc597
-rw-r--r--kdecore/network/ktcpsocket.cpp2
-rw-r--r--kdecore/network/ktcpsocket.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/kdecore/network/ktcpsocket.cpp b/kdecore/network/ktcpsocket.cpp
index 17b84d1..3a739f2 100644
--- a/kdecore/network/ktcpsocket.cpp
+++ b/kdecore/network/ktcpsocket.cpp
@@ -316,6 +316,8 @@ public:
return KTcpSocket::NetworkError;
case QAbstractSocket::UnsupportedSocketOperationError:
return KTcpSocket::UnsupportedSocketOperationError;
+ case QAbstractSocket::SslHandshakeFailedError:
+ return KTcpSocket::SslHandshakeFailedError;
case QAbstractSocket::DatagramTooLargeError:
//we don't do UDP
case QAbstractSocket::AddressInUseError:
diff --git a/kdecore/network/ktcpsocket.h b/kdecore/network/ktcpsocket.h
index 58dfa2c..c281b3e 100644
--- a/kdecore/network/ktcpsocket.h
+++ b/kdecore/network/ktcpsocket.h
@@ -175,7 +175,8 @@ public:
SocketResourceError,
SocketTimeoutError,
NetworkError,
- UnsupportedSocketOperationError
+ UnsupportedSocketOperationError,
+ SslHandshakeFailedError
};
/*
The following is based on reading the OpenSSL interface code of both QSslSocket