From 968682039b8f5c4f98a17be7a85afa623938a35d Mon Sep 17 00:00:00 2001 From: "yhirano@chromium.org" Date: Thu, 9 Jan 2014 10:38:04 +0000 Subject: Fail WebSocket channel when handshake fails. Call WebSocketMsg_NotifyFailure instead of WebSocketMsg_AddChannelResponse(true, ...) when the opening handshake fails. BUG=310405 R=ricea@chromium.org Review URL: https://codereview.chromium.org/105833003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243835 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/websocket_host.cc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'content/browser/renderer_host/websocket_host.cc') diff --git a/content/browser/renderer_host/websocket_host.cc b/content/browser/renderer_host/websocket_host.cc index aff172c..b1a0bab 100644 --- a/content/browser/renderer_host/websocket_host.cc +++ b/content/browser/renderer_host/websocket_host.cc @@ -92,6 +92,7 @@ class WebSocketEventHandler : public net::WebSocketEventInterface { virtual ChannelState OnFlowControl(int64 quota) OVERRIDE; virtual ChannelState OnDropChannel(uint16 code, const std::string& reason) OVERRIDE; + virtual ChannelState OnFailChannel(const std::string& message) OVERRIDE; private: WebSocketDispatcherHost* const dispatcher_; @@ -150,6 +151,13 @@ ChannelState WebSocketEventHandler::OnDropChannel(uint16 code, return StateCast(dispatcher_->DoDropChannel(routing_id_, code, reason)); } +ChannelState WebSocketEventHandler::OnFailChannel(const std::string& message) { + DVLOG(3) << "WebSocketEventHandler::OnFailChannel" + << " routing_id=" << routing_id_ + << " message=\"" << message << "\""; + return StateCast(dispatcher_->NotifyFailure(routing_id_, message)); +} + } // namespace WebSocketHost::WebSocketHost(int routing_id, -- cgit v1.1