diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-10 05:01:04 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-10 05:02:49 +0300 |
commit | 5087e0ced43d813eb6f765913a6fc3958d2a7a9d (patch) | |
tree | 6acc39b8ea0165562d480f1c54608c6c4ae9f865 /Source/WebCore/platform/network/qt/ResourceRequestQt.cpp | |
parent | 8b813e69d7764a1ad320de203fbcf17146ba469b (diff) | |
download | qtwebkit-5087e0ced43d813eb6f765913a6fc3958d2a7a9d.tar.gz |
Import QtWebKit commit f085f528406bf5656ce887e14c47b5e5fde4901d
Change-Id: I9bd682d60cdf85d3cca75faf84fbfd151213d98e
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebCore/platform/network/qt/ResourceRequestQt.cpp')
-rw-r--r-- | Source/WebCore/platform/network/qt/ResourceRequestQt.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp b/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp index 2cf2e7750..310738449 100644 --- a/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp +++ b/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp @@ -29,7 +29,10 @@ #if USE(HTTP2) #include <QSslSocket> +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) +#include <QHttp2Configuration> #endif +#endif // USE(HTTP2) namespace WebCore { @@ -65,6 +68,16 @@ bool ResourceRequest::alpnIsSupported() return QSslSocket::sslLibraryVersionNumber() > 0x10002000L && QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL")); } + +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) +static QHttp2Configuration createHttp2Configuration() +{ + QHttp2Configuration params; + params.setServerPushEnabled(true); + return params; +} +#endif + #endif QNetworkRequest ResourceRequest::toNetworkRequest(NetworkingContext *context) const @@ -76,8 +89,13 @@ QNetworkRequest ResourceRequest::toNetworkRequest(NetworkingContext *context) co #if USE(HTTP2) static const bool NegotiateHttp2ForHttps = alpnIsSupported(); - if (originalUrl.protocolIs("https") && NegotiateHttp2ForHttps) + if (originalUrl.protocolIs("https") && NegotiateHttp2ForHttps) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + static const auto params = createHttp2Configuration(); + request.setHttp2Configuration(params); +#endif request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true); + } #endif // USE(HTTP2) const HTTPHeaderMap &headers = httpHeaderFields(); |