Differential D24980 Diff 68817 src/core/tcpslavebase.cpp

Changeset View

Standalone View

View Options

src/core/tcpslavebase.cpp

Show All 26 Lines
27#include "tcpslavebase.h" 27​#include "tcpslavebase.h"
28#include "kiocoredebug.h" 28​#include "kiocoredebug.h"
29 29​
30#include <kconfiggroup.h> 30​#include <kconfiggroup.h>
31#include <ksslcertificatemanager.h> 31​#include <ksslcertificatemanager.h>
32#include <ksslsettings.h> 32​#include <ksslsettings.h>
33#include <klocalizedstring.h> 33​#include <klocalizedstring.h>
34#include <ktcpsocket.h> 34​#include <ktcpsocket.h>
35​#include "ksslerror_p.h"
35 36​
36#include <QDBusConnection> 37​#include <QDBusConnection>
37 38​
38using namespace KIO; 39​using namespace KIO;
39//using namespace KNetwork; 40​//using namespace KNetwork;
40 41​
41namespace KIO 42​namespace KIO
42{ 43​{
▲ Show 20 Lines • Show All 64 Lines • ▼ Show 20 Line(s)105 for (int i = 0; i < sslErrors.count(); i++) {
107 } 108​ }
108 } 109​ }
109 110​
110 QString errorStr; 111​ QString errorStr;
111 // encode the two-dimensional numeric error list using '\n' and '\t' as outer and inner separators 112​ // encode the two-dimensional numeric error list using '\n' and '\t' as outer and inner separators
112 for (const QSslCertificate &cert : peerCertificateChain ) { 113​ for (const QSslCertificate &cert : peerCertificateChain ) {
113 for (const KSslError &error : qAsConst(sslErrors)) { 114​ for (const KSslError &error : qAsConst(sslErrors)) {
114 if (error.certificate() == cert) { 115​ if (error.certificate() == cert) {
115 errorStr += QString::number(static_cast<int>(error.error())) + QLatin1Char('\t'); 116​ errorStr += QString::number(static_cast<int>(KSslErrorPrivate::errorFromKSslError(error.error()))) + QLatin1Char('\t');
116 } 117​ }
117 } 118​ }
118 if (errorStr.endsWith(QLatin1Char('\t'))) { 119​ if (errorStr.endsWith(QLatin1Char('\t'))) {
119 errorStr.chop(1); 120​ errorStr.chop(1);
120 } 121​ }
121 errorStr += QLatin1Char('\n'); 122​ errorStr += QLatin1Char('\n');
122 } 123​ }
123 errorStr.chop(1); 124​ errorStr.chop(1);
▲ Show 20 Lines • Show All 813 Lines • Show Last 20 Lines