diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 05:06:55 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 05:06:55 +0000 |
| commit | 857163eb100b1275a61d6ffe991846c34a61668f (patch) | |
| tree | 0428c61782b2ae05e355e2ef769bba01291f92ff /net/socket_stream/socket_stream_job.h | |
| parent | 0f2b2e95ea4c960e407e22075d7c2ec0ee1064d6 (diff) | |
| download | chromium_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 'net/socket_stream/socket_stream_job.h')
| -rw-r--r-- | net/socket_stream/socket_stream_job.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/socket_stream/socket_stream_job.h b/net/socket_stream/socket_stream_job.h index 9a4577e..24eaa19 100644 --- a/net/socket_stream/socket_stream_job.h +++ b/net/socket_stream/socket_stream_job.h @@ -32,7 +32,9 @@ class SocketStreamJob : public base::RefCountedThreadSafe<SocketStreamJob> { ProtocolFactory* factory); static SocketStreamJob* CreateSocketStreamJob( - const GURL& url, SocketStream::Delegate* delegate); + const GURL& url, + SocketStream::Delegate* delegate, + const URLRequestContext& context); SocketStreamJob(); void InitSocketStream(SocketStream* socket) { @@ -61,6 +63,7 @@ class SocketStreamJob : public base::RefCountedThreadSafe<SocketStreamJob> { virtual void DetachDelegate(); protected: + friend class WebSocketJobTest; friend class base::RefCountedThreadSafe<SocketStreamJob>; virtual ~SocketStreamJob(); |