diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-11-02 09:09:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-02 09:09:19 +0000 |
commit | 1ab8c7f6ed10f981d767a0acc2f420cf86775f12 (patch) | |
tree | 44eb556f62eeb50b980ae79712fa5087c2c7e3b0 /dev-qt/qtwebengine/files | |
parent | 29badda007a3bcd85bb351f602790eb3b8922448 (diff) |
gentoo auto-resync : 02:11:2022 - 09:09:18
Diffstat (limited to 'dev-qt/qtwebengine/files')
-rw-r--r-- | dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch b/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch new file mode 100644 index 000000000000..941c39c0a5a9 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.4.0-no-websocket-intercept.patch @@ -0,0 +1,38 @@ +Qt Bug: https://bugreports.qt.io/browse/QTBUG-107144 +Gerrit: https://codereview.qt-project.org/c/qt/qtwebengine/+/436316 +Patch: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebengine.git;a=commit;h=81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 + +From 81bf140583f7b7bf13cc8dd522e1ca2aba873fc4 Mon Sep 17 00:00:00 2001 +From: Martin Negyokru <negyokru@inf.u-szeged.hu> +Date: Mon, 3 Oct 2022 12:20:00 +0200 +Subject: [PATCH] Do not intercept websocket connection when there is no + associated frame + +This fix is based on chrome's implementation. + +Fixes: QTBUG-107144 +Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +(cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +--- + src/core/content_browser_client_qt.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp +index 020ae916af..99a3aa3f4f 100644 +--- a/src/core/content_browser_client_qt.cpp ++++ b/src/core/content_browser_client_qt.cpp +@@ -1237,8 +1237,7 @@ ContentBrowserClientQt::WillCreateURLLoaderRequestInterceptors(content::Navigati + + bool ContentBrowserClientQt::WillInterceptWebSocket(content::RenderFrameHost *frame) + { +- Q_UNUSED(frame); +- return true; // It is probably not worth it to only intercept when interceptors are installed ++ return frame != nullptr; + } + + QWebEngineUrlRequestInterceptor *getProfileInterceptorFromFrame(content::RenderFrameHost *frame) +-- +2.16.3 + |