summaryrefslogtreecommitdiffstats
path: root/src/network/access/qhttpnetworkconnectionchannel.cpp
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-10-16 08:11:14 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-10-16 08:11:14 (GMT)
commit4f48e43dc4f8237875d7d4a61bf4e55ab92e3941 (patch)
tree0436d256b8812a5ff638d799710d3b20b4459716 /src/network/access/qhttpnetworkconnectionchannel.cpp
parent9935ad5366463429ed4aa9b8db03c4605586f866 (diff)
parent2348200bfb277450cb2e79f6054d95b3041b10db (diff)
downloadQt-4f48e43dc4f8237875d7d4a61bf4e55ab92e3941.zip
Qt-4f48e43dc4f8237875d7d4a61bf4e55ab92e3941.tar.gz
Qt-4f48e43dc4f8237875d7d4a61bf4e55ab92e3941.tar.bz2
Merge commit 'origin/4.6' into mmfphonon
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel.cpp')
-rw-r--r--src/network/access/qhttpnetworkconnectionchannel.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 81fac57..6962ab3 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -105,6 +105,9 @@ void QHttpNetworkConnectionChannel::init()
QObject::connect(sslSocket, SIGNAL(sslErrors(const QList<QSslError>&)),
this, SLOT(_q_sslErrors(const QList<QSslError>&)),
Qt::DirectConnection);
+ QObject::connect(sslSocket, SIGNAL(encryptedBytesWritten(qint64)),
+ this, SLOT(_q_encryptedBytesWritten(qint64)),
+ Qt::DirectConnection);
}
#endif
}
@@ -881,6 +884,15 @@ void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
//QNetworkReply::NetworkError errorCode = QNetworkReply::ProtocolFailure;
emit connection->sslErrors(errors);
}
+
+void QHttpNetworkConnectionChannel::_q_encryptedBytesWritten(qint64 bytes)
+{
+ Q_UNUSED(bytes);
+ // bytes have been written to the socket. write even more of them :)
+ if (isSocketWriting())
+ sendRequest();
+ // otherwise we do nothing
+}
#endif
QT_END_NAMESPACE