Title: [257425] releases/WebKitGTK/webkit-2.28/Source/WebKit
- Revision
- 257425
- Author
- [email protected]
- Date
- 2020-02-26 02:55:34 -0800 (Wed, 26 Feb 2020)
Log Message
Merge r256719 - Log WebSocket failure in case of network crash
https://bugs.webkit.org/show_bug.cgi?id=207801
Reviewed by Darin Adler.
Covered by http/tests/websocket/tests/hybi/network-process-crash-error.html.
* WebProcess/Network/WebSocketChannel.cpp:
(WebKit::WebSocketChannel::didReceiveMessageError):
(WebKit::WebSocketChannel::networkProcessCrashed):
Add a console log message in case of error coming from network process.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (257424 => 257425)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-26 10:55:30 UTC (rev 257424)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-02-26 10:55:34 UTC (rev 257425)
@@ -1,3 +1,17 @@
+2020-02-16 Youenn Fablet <[email protected]>
+
+ Log WebSocket failure in case of network crash
+ https://bugs.webkit.org/show_bug.cgi?id=207801
+
+ Reviewed by Darin Adler.
+
+ Covered by http/tests/websocket/tests/hybi/network-process-crash-error.html.
+
+ * WebProcess/Network/WebSocketChannel.cpp:
+ (WebKit::WebSocketChannel::didReceiveMessageError):
+ (WebKit::WebSocketChannel::networkProcessCrashed):
+ Add a console log message in case of error coming from network process.
+
2020-02-15 Pavel Feldman <[email protected]>
[Geoclue] Avoid usage of provider in callbacks after it has been destroyed
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp (257424 => 257425)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp 2020-02-26 10:55:30 UTC (rev 257424)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/WebProcess/Network/WebSocketChannel.cpp 2020-02-26 10:55:34 UTC (rev 257425)
@@ -297,13 +297,15 @@
return;
}
- // FIXME: do something with errorMessage.
+ if (m_document)
+ m_document->addConsoleMessage(MessageSource::Network, MessageLevel::Error, errorMessage);
+
m_client->didReceiveMessageError();
}
void WebSocketChannel::networkProcessCrashed()
{
- didReceiveMessageError({ });
+ didReceiveMessageError("WebSocket network error: Network process crashed."_s);
}
void WebSocketChannel::suspend()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
