diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-06 09:46:51 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-11-06 14:25:20 +0000 |
commit | 8e860f836bce8fd70a90798f8817a1410d8d8414 (patch) | |
tree | 9cd4ddc95f3f1e46fd66ee2ddef2d264cac019e1 /src/network/access/qnetworkreplyhttpimpl.cpp | |
parent | 1a0b4b9f26e16532cc3d5532e25d886426ce994e (diff) | |
parent | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (diff) |
Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev
Diffstat (limited to 'src/network/access/qnetworkreplyhttpimpl.cpp')
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index 67e16c4d64..18d85a27a1 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -787,6 +787,10 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq // Create the HTTP thread delegate QHttpThreadDelegate *delegate = new QHttpThreadDelegate; + // Propagate Http/2 settings if any + const QVariant blob(manager->property(Http2::http2ParametersPropertyName)); + if (blob.isValid() && blob.canConvert<Http2::ProtocolParameters>()) + delegate->http2Parameters = blob.value<Http2::ProtocolParameters>(); #ifndef QT_NO_BEARERMANAGEMENT delegate->networkSession = managerPrivate->getNetworkSession(); #endif |