OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "net/url_request/url_request_ftp_job.h" | 5 #include "net/url_request/url_request_ftp_job.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
94 DCHECK(!pac_request_); | 94 DCHECK(!pac_request_); |
95 DCHECK(!ftp_transaction_); | 95 DCHECK(!ftp_transaction_); |
96 DCHECK(!http_transaction_); | 96 DCHECK(!http_transaction_); |
97 | 97 |
98 int rv = OK; | 98 int rv = OK; |
99 if (request_->load_flags() & LOAD_BYPASS_PROXY) { | 99 if (request_->load_flags() & LOAD_BYPASS_PROXY) { |
100 proxy_info_.UseDirect(); | 100 proxy_info_.UseDirect(); |
101 } else { | 101 } else { |
102 DCHECK_EQ(request_->context()->proxy_service(), proxy_service_); | 102 DCHECK_EQ(request_->context()->proxy_service(), proxy_service_); |
103 rv = proxy_service_->ResolveProxy( | 103 rv = proxy_service_->ResolveProxy( |
104 request_->url(), | 104 request_->url(), request_->method(), request_->load_flags(), |
mmenke
2016/03/02 22:53:45
Methods are meaningless for FTP requests. Should
RyanSturm
2016/03/03 18:54:31
Done.
| |
105 request_->load_flags(), | 105 &proxy_info_, base::Bind(&URLRequestFtpJob::OnResolveProxyComplete, |
106 &proxy_info_, | 106 base::Unretained(this)), |
107 base::Bind(&URLRequestFtpJob::OnResolveProxyComplete, | 107 &pac_request_, NULL, request_->net_log()); |
108 base::Unretained(this)), | |
109 &pac_request_, | |
110 NULL, | |
111 request_->net_log()); | |
112 | 108 |
113 if (rv == ERR_IO_PENDING) | 109 if (rv == ERR_IO_PENDING) |
114 return; | 110 return; |
115 } | 111 } |
116 OnResolveProxyComplete(rv); | 112 OnResolveProxyComplete(rv); |
117 } | 113 } |
118 | 114 |
119 void URLRequestFtpJob::Kill() { | 115 void URLRequestFtpJob::Kill() { |
120 if (pac_request_) { | 116 if (pac_request_) { |
121 proxy_service_->CancelPacRequest(pac_request_); | 117 proxy_service_->CancelPacRequest(pac_request_); |
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
376 if (cached_auth) { | 372 if (cached_auth) { |
377 // Retry using cached auth data. | 373 // Retry using cached auth data. |
378 SetAuth(cached_auth->credentials); | 374 SetAuth(cached_auth->credentials); |
379 } else { | 375 } else { |
380 // Prompt for a username/password. | 376 // Prompt for a username/password. |
381 NotifyHeadersComplete(); | 377 NotifyHeadersComplete(); |
382 } | 378 } |
383 } | 379 } |
384 | 380 |
385 } // namespace net | 381 } // namespace net |
OLD | NEW |