path: root/src/network/access/qhttpnetworkconnection_p.h
diff options
authorVladimir Prus <>2015-11-20 11:20:02 +0300
committerAndré Klitzing <>2016-10-05 19:46:51 +0000
commit840e2dd2f04a32120e2ca450fba6f79b06ca2515 (patch)
treea5cea47bb435bc228d6d21bb6932c7c075607ce3 /src/network/access/qhttpnetworkconnection_p.h
parentdc737fa0d77a7549396efcf9ffa6e917dd40595f (diff)
Make sure SSL configuration is correct in QNetworkReply::encrypted.
In some cases, when QNetworkReply::encrypted is emitted, QNetworkReply::sslConfiguration is not yet initialized, in particular certificate chain is empty, which breaks the documented usage of 'encrypted' to perform additional checks on certificate chain. It looks to be caused by the fact that QHttpNetworkReply is originally associated with 0th QHttpNetworkConnectionChannel, and this association is not updated if HTTP pipelining is not used. Therefore, a reply on channel >0 might arrive before reply on channel 0, and then using ssl configuration from channel 0, which not made it through handshake, is not usable. Task-number: QTBUG-49554 Change-Id: Ie5d4b5a0c503d5bdc44761ce8581f6ffe4e3bac2 Reviewed-by: Markus Goetz (Woboq GmbH) <>
Diffstat (limited to 'src/network/access/qhttpnetworkconnection_p.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 9af39d416a..d63e722be1 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -207,6 +207,7 @@ public:
void requeueRequest(const HttpMessagePair &pair); // e.g. after pipeline broke
bool dequeueRequest(QAbstractSocket *socket);
void prepareRequest(HttpMessagePair &request);
+ void updateChannel(int i, const HttpMessagePair &messagePair);
QHttpNetworkRequest predictNextRequest();
void fillPipeline(QAbstractSocket *socket);