| Index: content/child/websocket_bridge.cc
|
| diff --git a/content/child/websocket_bridge.cc b/content/child/websocket_bridge.cc
|
| index 7cfff1ad50a942960024e79ac8d98377e363642d..51d127424a275dbfe3ef4e690c3d1dcb87e156d0 100644
|
| --- a/content/child/websocket_bridge.cc
|
| +++ b/content/child/websocket_bridge.cc
|
| @@ -206,6 +206,7 @@ void WebSocketBridge::DidStartClosingHandshake() {
|
| void WebSocketBridge::connect(const WebURL& url,
|
| const WebVector<WebString>& protocols,
|
| const WebSecurityOrigin& origin,
|
| + const WebString& additional_headers,
|
| WebSocketHandleClient* client) {
|
| DCHECK_EQ(kInvalidChannelId, channel_id_);
|
| WebSocketDispatcher* dispatcher =
|
| @@ -221,8 +222,10 @@ void WebSocketBridge::connect(const WebURL& url,
|
| << base::JoinString(protocols_to_pass, ", ") << "), "
|
| << origin.toString().utf8() << ")";
|
|
|
| + // Headers are ISO Latin 1.
|
| ChildThreadImpl::current()->Send(new WebSocketHostMsg_AddChannelRequest(
|
| - channel_id_, url, protocols_to_pass, origin, render_frame_id_));
|
| + channel_id_, url, protocols_to_pass, origin,
|
| + additional_headers.latin1(), render_frame_id_));
|
| }
|
|
|
| void WebSocketBridge::send(bool fin,
|
|
|