diff options
Diffstat (limited to 'src/network/ssl')
-rw-r--r-- | src/network/ssl/qsslsocket.cpp | 12 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket.h | 1 | ||||
-rw-r--r-- | src/network/ssl/qsslsocket_p.h | 1 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 66bcb79c4c..19ab903d36 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -2541,17 +2541,19 @@ QByteArray QSslSocketPrivate::peek(qint64 maxSize) } /*! - \internal + \reimp */ -qint64 QSslSocketPrivate::skip(qint64 maxSize) +qint64 QSslSocket::skipData(qint64 maxSize) { - if (mode == QSslSocket::UnencryptedMode && !autoStartHandshake) - return plainSocket->skip(maxSize); + Q_D(QSslSocket); + + if (d->mode == QSslSocket::UnencryptedMode && !d->autoStartHandshake) + return d->plainSocket->skip(maxSize); // In encrypted mode, the SSL backend writes decrypted data directly into the // QIODevice's read buffer. As this buffer is always emptied by the caller, // we need to wait for more incoming data. - return (state == QAbstractSocket::ConnectedState) ? Q_INT64_C(0) : Q_INT64_C(-1); + return (d->state == QAbstractSocket::ConnectedState) ? Q_INT64_C(0) : Q_INT64_C(-1); } /*! diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index b28916c951..4a576b1784 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -186,6 +186,7 @@ Q_SIGNALS: protected: qint64 readData(char *data, qint64 maxlen) override; + qint64 skipData(qint64 maxSize) override; qint64 writeData(const char *data, qint64 len) override; private: diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 60d5cd1484..31b8b79302 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -190,7 +190,6 @@ public: virtual qint64 peek(char *data, qint64 maxSize) override; virtual QByteArray peek(qint64 maxSize) override; - qint64 skip(qint64 maxSize) override; bool flush() override; // Platform specific functions |