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