Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

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
« net/http/websocket_stream_base.h ('K') | « net/net.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
mmenke 2013/05/28 21:22:37 Another issue for the CL to use the right HttpStre
yhirano 2013/05/30 04:44:32 I'm not sure if I understand your comment correctl
mmenke 2013/05/30 19:27:12 The issue is this code isn't using a CONNECT. Loo
yhirano 2013/05/31 08:36:45 I see, I added InitSocketHandleForWebSocket which
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 »

Powered by Google App Engine
This is Rietveld 408576698