diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 09:17:03 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-16 09:17:03 +0000 |
| commit | 60998a63d2c655414391ed7da9d0dc944c72d043 (patch) | |
| tree | b049e7e3a73e6881a6129b837dddefdd0e044dc6 /net/socket_stream | |
| parent | 6f3e054362bd110c40f39bd1431ca4e57a856bdf (diff) | |
| download | chromium_src-60998a63d2c655414391ed7da9d0dc944c72d043.zip chromium_src-60998a63d2c655414391ed7da9d0dc944c72d043.tar.gz chromium_src-60998a63d2c655414391ed7da9d0dc944c72d043.tar.bz2 | |
Reverting 32045.
Review URL: http://codereview.chromium.org/396009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 17 | ||||
| -rw-r--r-- | net/socket_stream/socket_stream.h | 1 |
2 files changed, 1 insertions, 17 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index d9c6a88..7227fe9 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -47,7 +47,6 @@ SocketStream::SocketStream(const GURL& url, Delegate* delegate) next_state_(STATE_NONE), factory_(ClientSocketFactory::GetDefaultFactory()), proxy_mode_(kDirectConnection), - proxy_url_(url), pac_request_(NULL), ALLOW_THIS_IN_INITIALIZER_LIST( io_callback_(this, &SocketStream::OnIOCompleted)), @@ -415,7 +414,7 @@ int SocketStream::DoResolveProxy() { next_state_ = STATE_RESOLVE_PROXY_COMPLETE; return proxy_service()->ResolveProxy( - proxy_url_, &proxy_info_, &io_callback_, &pac_request_, load_log_); + url_, &proxy_info_, &io_callback_, &pac_request_, load_log_); } int SocketStream::DoResolveProxyComplete(int result) { @@ -428,20 +427,6 @@ int SocketStream::DoResolveProxyComplete(int result) { delegate_->OnError(this, result); proxy_info_.UseDirect(); } - if (proxy_info_.is_direct()) { - // If proxy was not found for original URL (i.e. websocket URL), - // try again with https URL, like Safari implementation. - // Note that we don't want to use http proxy, because we'll use tunnel - // proxy using CONNECT method, which is used by https proxy. - if (!proxy_url_.SchemeIs("https")) { - GURL::Replacements repl; - repl.SetSchemeStr("https"); - proxy_url_ = url_.ReplaceComponents(repl); - DLOG(INFO) << "Try https proxy: " << proxy_url_; - next_state_ = STATE_RESOLVE_PROXY; - return OK; - } - } return OK; } diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h index cf6a6b0..f6ac674 100644 --- a/net/socket_stream/socket_stream.h +++ b/net/socket_stream/socket_stream.h @@ -270,7 +270,6 @@ class SocketStream : public base::RefCountedThreadSafe<SocketStream> { ProxyMode proxy_mode_; - GURL proxy_url_; ProxyService::PacRequest* pac_request_; ProxyInfo proxy_info_; |