summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkreplyhttpimpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/access/qnetworkreplyhttpimpl.cpp')
-rw-r--r--src/network/access/qnetworkreplyhttpimpl.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 5cd0747e34..bdb23ede1d 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -1234,7 +1234,14 @@ void QNetworkReplyHttpImplPrivate::replyDownloadMetaData(const QList<QPair<QByte
}
q->setAttribute(QNetworkRequest::HttpPipeliningWasUsedAttribute, pu);
- q->setAttribute(QNetworkRequest::SpdyWasUsedAttribute, spdyWasUsed);
+ const QVariant http2Allowed = request.attribute(QNetworkRequest::HTTP2AllowedAttribute);
+ if (http2Allowed.isValid() && http2Allowed.toBool()) {
+ q->setAttribute(QNetworkRequest::HTTP2WasUsedAttribute, spdyWasUsed);
+ q->setAttribute(QNetworkRequest::SpdyWasUsedAttribute, false);
+ } else {
+ q->setAttribute(QNetworkRequest::SpdyWasUsedAttribute, spdyWasUsed);
+ q->setAttribute(QNetworkRequest::HTTP2WasUsedAttribute, false);
+ }
// reconstruct the HTTP header
QList<QPair<QByteArray, QByteArray> > headerMap = hm;