diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2012-01-20 13:55:15 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 19:35:05 +0100 |
| commit | 07662f93ac700d18bf2c7f5e3df1fa310327130d (patch) | |
| tree | 8a1a81ab5d9e905b3e09f83673777fb8b4b1e978 /src/network/ssl/qsslsocket_p.h | |
| parent | 0da4451b783b02d6df464fba9f0c34828df1ac06 (diff) | |
QAbstractSocket / QSslSocket: add API to pause and resume
pause and resume is currently only supported upon emitting the
QSslSocket::sslErrors() signal. The API was added in QAbstractSocket to
also support QAbstractSocket::proxyAuthenticationRequired() in the
future.
This is the first patch to support that feature on the socket level,
another patch will follow to support sslErrors() and
authenticationRequired() in QNetworkAccessManager / QNetworkReply.
Task-number: QTBUG-19032
Change-Id: Ide2918268590ab9a01454ab26cb7fdca3dc840ab
Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
Diffstat (limited to 'src/network/ssl/qsslsocket_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index c9be2cdd97..f424f29dba 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -149,6 +149,7 @@ public: void createPlainSocket(QIODevice::OpenMode openMode); static void pauseSocketNotifiers(QSslSocket*); static void resumeSocketNotifiers(QSslSocket*); + bool isPaused() const; void _q_connectedSlot(); void _q_hostFoundSlot(); void _q_disconnectedSlot(); @@ -158,6 +159,7 @@ public: void _q_bytesWrittenSlot(qint64); void _q_flushWriteBuffer(); void _q_flushReadBuffer(); + void _q_resumeImplementation(); // Platform specific functions virtual void startClientEncryption() = 0; @@ -166,6 +168,7 @@ public: virtual void disconnectFromHost() = 0; virtual void disconnected() = 0; virtual QSslCipher sessionCipher() const = 0; + virtual void continueHandshake() = 0; private: static bool ensureLibraryLoaded(); @@ -174,8 +177,10 @@ private: static bool s_libraryLoaded; static bool s_loadedCiphersAndCerts; protected: + bool verifyErrorsHaveBeenIgnored(); static bool s_loadRootCertsOnDemand; static QList<QByteArray> unixRootCertDirectories(); + bool paused; }; QT_END_NAMESPACE |