diff options
author | Markus Goetz <Markus.Goetz@nokia.com> | 2010-02-17 15:36:40 (GMT) |
---|---|---|
committer | Markus Goetz <Markus.Goetz@nokia.com> | 2010-02-18 10:34:48 (GMT) |
commit | a4332ce058cf3fe567b386d300ba740442a69f44 (patch) | |
tree | 3d51bb57f5dc434ded41e03a7ef80cc90058d367 /src/network/access/qhttpnetworkconnection.cpp | |
parent | 4971430290ecb11012ef5cbf8ef041da0ec3a824 (diff) | |
download | Qt-a4332ce058cf3fe567b386d300ba740442a69f44.zip Qt-a4332ce058cf3fe567b386d300ba740442a69f44.tar.gz Qt-a4332ce058cf3fe567b386d300ba740442a69f44.tar.bz2 |
QNAM HTTP: Always set channel.reply to 0 when done
This will help us to track down a sporadic bug that made requests
being sent again even if they were already done.
Reviewed-by: Peter Hartmann
Diffstat (limited to 'src/network/access/qhttpnetworkconnection.cpp')
-rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index cc6a1c8..327d2db 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -404,6 +404,7 @@ QHttpNetworkReply* QHttpNetworkConnectionPrivate::queueRequest(const QHttpNetwor QHttpNetworkReply *reply = new QHttpNetworkReply(request.url()); reply->setRequest(request); reply->d_func()->connection = q; + reply->d_func()->connectionChannel = &channels[0]; // will have the correct one set later HttpMessagePair pair = qMakePair(request, reply); switch (request.priority()) { @@ -861,17 +862,6 @@ QNetworkProxy QHttpNetworkConnection::transparentProxy() const // SSL support below #ifndef QT_NO_OPENSSL -QSslConfiguration QHttpNetworkConnectionPrivate::sslConfiguration(const QHttpNetworkReply &reply) const -{ - if (!encrypt) - return QSslConfiguration(); - - for (int i = 0; i < channelCount; ++i) - if (channels[i].reply == &reply) - return static_cast<QSslSocket *>(channels[0].socket)->sslConfiguration(); - return QSslConfiguration(); // pending or done request -} - void QHttpNetworkConnection::setSslConfiguration(const QSslConfiguration &config) { Q_D(QHttpNetworkConnection); |