diff options
| author | tyoshino@google.com <tyoshino@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 03:51:33 +0000 |
|---|---|---|
| committer | tyoshino@google.com <tyoshino@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 03:51:33 +0000 |
| commit | d3c3274426c2f6b9f1796cda6d5b4466237cfaf7 (patch) | |
| tree | 764b99016975d8c56a44b58d3de3398381c32e73 /net/url_request/url_request_ftp_job.cc | |
| parent | 48e144ee5faf657841f2051f9a94b46b8a96fc89 (diff) | |
| download | chromium_src-d3c3274426c2f6b9f1796cda6d5b4466237cfaf7.zip chromium_src-d3c3274426c2f6b9f1796cda6d5b4466237cfaf7.tar.gz chromium_src-d3c3274426c2f6b9f1796cda6d5b4466237cfaf7.tar.bz2 | |
Reverting 26419.
Looks like this CL caused failure in Modules Linux (valgrind)
http://chrome-buildbot.corp.google.com:8010/builders/Modules%20Linux%20(valgrind)/builds/1104/steps/valgrind%20test:%20base/logs/stdio
http://chrome-buildbot.corp.google.com:8010/builders/Modules%20Linux%20(valgrind)/builds/1103/steps/valgrind%20test:%20base/logs/stdio
[----------] 6 tests from ClipboardTest
[ RUN ] ClipboardTest.ClearTest
command timed out: 1200 seconds without output, killing pid 7479
process killed by signal 9
program finished with exit code -1
TBR=phajdan.jr
Review URL: http://codereview.chromium.org/212007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_ftp_job.cc')
| -rw-r--r-- | net/url_request/url_request_ftp_job.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index bc7f085..eca845a 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -138,8 +138,7 @@ void URLRequestFtpJob::SendRequest() { username = WideToUTF8(server_auth_->username); password = WideToUTF8(server_auth_->password); request_->context()->ftp_auth_cache()->Add(request_->url().GetOrigin(), - server_auth_->username, - server_auth_->password); + server_auth_.get()); } else { if (request_->url().has_username()) { username = request_->url().username(); @@ -184,15 +183,13 @@ void URLRequestFtpJob::OnIOComplete(const AsyncResult& result) { GURL origin = request_->url().GetOrigin(); if (server_auth_ != NULL && server_auth_->state == net::AUTH_STATE_HAVE_AUTH) { - request_->context()->ftp_auth_cache()->Remove(origin, - server_auth_->username, - server_auth_->password); + request_->context()->ftp_auth_cache()->Remove(origin); } else { server_auth_ = new net::AuthData(); } server_auth_->state = net::AUTH_STATE_NEED_AUTH; - net::FtpAuthCache::Entry* cached_auth = + scoped_refptr<net::AuthData> cached_auth = request_->context()->ftp_auth_cache()->Lookup(origin); if (cached_auth) { |