net/websockets/websocket_basic_handshake_stream.cc - Issue 683033003: Rename websocket_handshake_handler.* to websocket_handshake_challenge.*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/websockets/websocket_basic_handshake_stream.cc

Issue 683033003: Rename websocket_handshake_handler.* to websocket_handshake_challenge.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update copyright messages for new files. Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: net/websockets/websocket_basic_handshake_stream.cc

diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc

index 769b80207341615dce9646a478770850dc2bed7a..08ee6ae674ca6f78e3546f4a6560569a8a0da260 100644

--- a/net/websockets/websocket_basic_handshake_stream.cc

+++ b/net/websockets/websocket_basic_handshake_stream.cc

@@ -39,8 +39,8 @@

#include "net/websockets/websocket_deflate_stream.h"

#include "net/websockets/websocket_deflater.h"

#include "net/websockets/websocket_extension_parser.h"

+#include "net/websockets/websocket_handshake_challenge.h"

#include "net/websockets/websocket_handshake_constants.h"

-#include "net/websockets/websocket_handshake_handler.h"

#include "net/websockets/websocket_handshake_request_info.h"

#include "net/websockets/websocket_handshake_response_info.h"

#include "net/websockets/websocket_stream.h"

@@ -435,8 +435,8 @@ int WebSocketBasicHandshakeStream::SendRequest(

requested_sub_protocols_,

&enriched_headers);

- ComputeSecWebSocketAccept(handshake_challenge,

- &handshake_challenge_response_);

+ handshake_challenge_response_ =

+ ComputeSecWebSocketAccept(handshake_challenge);

DCHECK(connect_delegate_);

scoped_ptr<WebSocketHandshakeRequestInfo> request(

« no previous file with comments | « net/net.gypi ('k') | net/websockets/websocket_handshake_challenge.h » ('j') | no next file with comments »