diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch b/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch new file mode 100644 index 00000000..15607c0d --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0006-Disable-code-related-to-HTTP-2-when-Qt-is-configured.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 32eb0352d98fcf325b0a94a4f7e141d746938a4b Mon Sep 17 00:00:00 2001 | ||
2 | From: Konstantin Tokarev <annulen@yandex.ru> | ||
3 | Date: Sun, 3 May 2020 18:50:24 +0300 | ||
4 | Subject: [PATCH] Disable code related to HTTP/2 when Qt is configured without SSL support | ||
5 | |||
6 | For enabling HTTP/2 by default we check if Qt uses OpenSSL and its version | ||
7 | is 1.0.2 or higher via QSslSocket API. While it would be sufficient to | ||
8 | add guards just there, we are not going to enable HTTP/2 for QT_NO_SSL | ||
9 | case by default anyway (note that it still can be done in application code). | ||
10 | |||
11 | Change-Id: I77b4a423ff1028725ac2c0953c757dce2db23e05 | ||
12 | --- | ||
13 | Upstream-Status: Backport [https://github.com/qtwebkit/qtwebkit/commit/e7ec14144ce58418d94568c41ac94d4d87969363] | ||
14 | Signed-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 | |||
19 | diff --git a/Source/WebCore/platform/network/qt/ResourceRequest.h b/Source/WebCore/platform/network/qt/ResourceRequest.h | ||
20 | index 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 | -- | ||
33 | 2.29.2 | ||
34 | |||