net/socket/client_socket_pool_manager.cc - Issue 14813024: Introduce RequestWebSocketStream into HttpStreamFactory

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/socket/client_socket_pool_manager.cc

Issue 14813024: Introduce RequestWebSocketStream into HttpStreamFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 7 months 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/socket/client_socket_pool_manager.cc

diff --git a/net/socket/client_socket_pool_manager.cc b/net/socket/client_socket_pool_manager.cc

index cd4f10f374d6a0019130dc7297a2a1349393fdf4..c4449c64590ca66a468913ecd39742fb658dc95b 100644

--- a/net/socket/client_socket_pool_manager.cc

+++ b/net/socket/client_socket_pool_manager.cc

@@ -88,7 +88,8 @@ int InitSocketPoolHelper(const GURL& request_url,

scoped_refptr<SOCKSSocketParams> socks_params;

scoped_ptr<HostPortPair> proxy_host_port;

- bool using_ssl = request_url.SchemeIs("https") || force_spdy_over_ssl;

+ bool using_ssl = request_url.SchemeIs("https") ||

+ request_url.SchemeIs("wss") || force_spdy_over_ssl;

HostPortPair origin_host_port =

HostPortPair(request_url.HostNoBrackets(),

« net/http/websocket_stream_base.h ('K') | « net/net.gyp ('k') | no next file » | no next file with comments »