diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 05:27:03 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 05:27:03 +0000 |
| commit | 7de2cf6dea088d93b88e997605e229888fadfceb (patch) | |
| tree | 744467f8d61230f2814c0363495d0fc7639a1cd7 /net/socket_stream/socket_stream.h | |
| parent | 95bec26b7048557768a515b2751a7c86614d2059 (diff) | |
| download | chromium_src-7de2cf6dea088d93b88e997605e229888fadfceb.zip chromium_src-7de2cf6dea088d93b88e997605e229888fadfceb.tar.gz chromium_src-7de2cf6dea088d93b88e997605e229888fadfceb.tar.bz2 | |
secure proxy support in websocket
If an error is returned synchronously, next_state_ is not STATE_CLOSE.
In such case, we should just close the socket stream with the error.
BUG=83950
TEST=net_unittest --gtest_filter=SocketStreamTest.* pass
Review URL: http://codereview.chromium.org/7484065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream/socket_stream.h')
| -rw-r--r-- | net/socket_stream/socket_stream.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h index 19331f4..5e5b339 100644 --- a/net/socket_stream/socket_stream.h +++ b/net/socket_stream/socket_stream.h @@ -228,6 +228,8 @@ class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> { STATE_READ_TUNNEL_HEADERS_COMPLETE, STATE_SOCKS_CONNECT, STATE_SOCKS_CONNECT_COMPLETE, + STATE_SECURE_PROXY_CONNECT, + STATE_SECURE_PROXY_CONNECT_COMPLETE, STATE_SSL_CONNECT, STATE_SSL_CONNECT_COMPLETE, STATE_READ_WRITE, @@ -255,6 +257,7 @@ class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> { // notifications will be sent to delegate. void Finish(int result); + int DidEstablishSSL(int result); int DidEstablishConnection(); int DidReceiveData(int result); int DidSendData(int result); @@ -279,6 +282,8 @@ class NET_API SocketStream : public base::RefCountedThreadSafe<SocketStream> { int DoReadTunnelHeadersComplete(int result); int DoSOCKSConnect(); int DoSOCKSConnectComplete(int result); + int DoSecureProxyConnect(); + int DoSecureProxyConnectComplete(int result); int DoSSLConnect(); int DoSSLConnectComplete(int result); int DoReadWrite(int result); |