Commit d31715db authored by David Faure's avatar David Faure
Browse files

KTcpSocket: forward encryptedBytesWritten from QSslSocket.

Very important for the timeout detection in the akonadi imap resource.
write(5MB) gives an immediate bytesWritten(5MB), only encryptedBytesWritten
allows to see some regular activity on the socket.

CCBUG: 258271, 258361
parent 0420deb0
......@@ -380,6 +380,7 @@ KTcpSocket::KTcpSocket(QObject *parent)
connect(&d->sock, SIGNAL(aboutToClose()), this, SIGNAL(aboutToClose()));
connect(&d->sock, SIGNAL(bytesWritten(qint64)), this, SIGNAL(bytesWritten(qint64)));
connect(&d->sock, SIGNAL(encryptedBytesWritten(qint64)), this, SIGNAL(encryptedBytesWritten(qint64)));
connect(&d->sock, SIGNAL(readyRead()), this, SLOT(reemitReadyRead()));
connect(&d->sock, SIGNAL(connected()), this, SIGNAL(connected()));
connect(&d->sock, SIGNAL(encrypted()), this, SIGNAL(encrypted()));
......
......@@ -237,6 +237,10 @@ QSslError::NoSslSupport Never happens :)
protected:
virtual qint64 readData (char *data, qint64 maxSize);
virtual qint64 writeData (const char *data, qint64 maxSize);
signals:
/// @since 4.8.1
/// Forwarded from QSslSocket
void encryptedBytesWritten( qint64 written );
public:
//from QAbstractSocket
void abort();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment