summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/simple_socket_stream_bridge.cc
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-19 05:06:55 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-19 05:06:55 +0000
commit857163eb100b1275a61d6ffe991846c34a61668f (patch)
tree0428c61782b2ae05e355e2ef769bba01291f92ff /webkit/tools/test_shell/simple_socket_stream_bridge.cc
parent0f2b2e95ea4c960e407e22075d7c2ec0ee1064d6 (diff)
downloadchromium_src-857163eb100b1275a61d6ffe991846c34a61668f.zip
chromium_src-857163eb100b1275a61d6ffe991846c34a61668f.tar.gz
chromium_src-857163eb100b1275a61d6ffe991846c34a61668f.tar.bz2
Apply HSTS rules to also upgrade ws:// -> wss:// if appropriate. This avoids
a minor issue whereby failure to set a cookie "Secure" can get leaked via a WebSocket when http itself is mitiagted. TEST=WebSocketJobTest.HSTSUpgrade Review URL: http://codereview.chromium.org/6873029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82069 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/simple_socket_stream_bridge.cc')
-rw-r--r--webkit/tools/test_shell/simple_socket_stream_bridge.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
index 4420b26..a555b48 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc
+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
@@ -156,7 +156,8 @@ void WebSocketStreamHandleBridgeImpl::OnClose(net::SocketStream* socket) {
void WebSocketStreamHandleBridgeImpl::DoConnect(const GURL& url) {
DCHECK(MessageLoop::current() == g_io_thread);
- socket_ = net::SocketStreamJob::CreateSocketStreamJob(url, this);
+ socket_ = net::SocketStreamJob::CreateSocketStreamJob(
+ url, this, *g_request_context);
socket_->set_context(g_request_context);
socket_->Connect();
}