From beb83bae7c54fb798fe13358cde52aee0f1abef3 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 8 Sep 2022 10:37:33 +1000 Subject: wasm: fix websocket use from worker thread MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit self is the current window or WorkerGlobalScope Pick-to: 6.4 6.4.0 Fixes: QTBUG-106372 Change-Id: Ia23f8bd147d729d224ba8de0d44c07877ba24631 Reviewed-by: Mårten Nordheim Reviewed-by: Morten Johan Sørvig --- src/websockets/qwebsocket_wasm_p.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/websockets/qwebsocket_wasm_p.cpp b/src/websockets/qwebsocket_wasm_p.cpp index 398fd01..e0b2156 100644 --- a/src/websockets/qwebsocket_wasm_p.cpp +++ b/src/websockets/qwebsocket_wasm_p.cpp @@ -136,7 +136,7 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, const QUrl url = request.url(); - emscripten::val navProtocol = emscripten::val::global("window")["location"]["protocol"]; + emscripten::val navProtocol = emscripten::val::global("self")["location"]["protocol"]; // An insecure WebSocket connection may not be initiated from a page loaded over HTTPS. // and causes emscripten to assert -- cgit v1.2.3