1*4882a593SmuzhiyunFrom 32eb0352d98fcf325b0a94a4f7e141d746938a4b Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Konstantin Tokarev <annulen@yandex.ru> 3*4882a593SmuzhiyunDate: Sun, 3 May 2020 18:50:24 +0300 4*4882a593SmuzhiyunSubject: [PATCH] Disable code related to HTTP/2 when Qt is configured without SSL support 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFor enabling HTTP/2 by default we check if Qt uses OpenSSL and its version 7*4882a593Smuzhiyunis 1.0.2 or higher via QSslSocket API. While it would be sufficient to 8*4882a593Smuzhiyunadd guards just there, we are not going to enable HTTP/2 for QT_NO_SSL 9*4882a593Smuzhiyuncase by default anyway (note that it still can be done in application code). 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunChange-Id: I77b4a423ff1028725ac2c0953c757dce2db23e05 12*4882a593Smuzhiyun--- 13*4882a593SmuzhiyunUpstream-Status: Backport [https://github.com/qtwebkit/qtwebkit/commit/e7ec14144ce58418d94568c41ac94d4d87969363] 14*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 15*4882a593Smuzhiyun 16*4882a593Smuzhiyun Source/WebCore/platform/network/qt/ResourceRequest.h | 2 +- 17*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/Source/WebCore/platform/network/qt/ResourceRequest.h b/Source/WebCore/platform/network/qt/ResourceRequest.h 20*4882a593Smuzhiyunindex 1154d56a0..87e21ec3f 100644 21*4882a593Smuzhiyun--- a/Source/WebCore/platform/network/qt/ResourceRequest.h 22*4882a593Smuzhiyun+++ b/Source/WebCore/platform/network/qt/ResourceRequest.h 23*4882a593Smuzhiyun@@ -32,7 +32,7 @@ 24*4882a593Smuzhiyun // HTTP/2 is implemented since Qt 5.8, but various QtNetwork bugs make it unusable in browser with Qt < 5.10.1 25*4882a593Smuzhiyun // We also don't enable HTTP/2 for unencrypted connections because of possible compatibility issues; it can be 26*4882a593Smuzhiyun // enabled manually by user application via custom QNAM subclass 27*4882a593Smuzhiyun-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 1) 28*4882a593Smuzhiyun+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 1) && !defined(QT_NO_SSL) 29*4882a593Smuzhiyun #define USE_HTTP2 1 30*4882a593Smuzhiyun #endif 31*4882a593Smuzhiyun 32*4882a593Smuzhiyun-- 33*4882a593Smuzhiyun2.29.2 34*4882a593Smuzhiyun 35