Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: net/proxy/proxy_script_fetcher_impl.cc

Issue 9188019: Cleanup: Rename is_hsts_host to fatal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/ssl/ssl_policy.cc ('k') | net/url_request/url_request.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/proxy/proxy_script_fetcher_impl.h" 5 #include "net/proxy/proxy_script_fetcher_impl.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/i18n/icu_string_conversions.h" 8 #include "base/i18n/icu_string_conversions.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 AuthChallengeInfo* auth_info) { 183 AuthChallengeInfo* auth_info) {
184 DCHECK_EQ(request, cur_request_.get()); 184 DCHECK_EQ(request, cur_request_.get());
185 // TODO(eroman): http://crbug.com/77366 185 // TODO(eroman): http://crbug.com/77366
186 LOG(WARNING) << "Auth required to fetch PAC script, aborting."; 186 LOG(WARNING) << "Auth required to fetch PAC script, aborting.";
187 result_code_ = ERR_NOT_IMPLEMENTED; 187 result_code_ = ERR_NOT_IMPLEMENTED;
188 request->CancelAuth(); 188 request->CancelAuth();
189 } 189 }
190 190
191 void ProxyScriptFetcherImpl::OnSSLCertificateError(URLRequest* request, 191 void ProxyScriptFetcherImpl::OnSSLCertificateError(URLRequest* request,
192 const SSLInfo& ssl_info, 192 const SSLInfo& ssl_info,
193 bool is_hsts_host) { 193 bool fatal) {
194 DCHECK_EQ(request, cur_request_.get()); 194 DCHECK_EQ(request, cur_request_.get());
195 // Revocation check failures are not fatal. 195 // Revocation check failures are not fatal.
196 if (IsCertStatusMinorError(ssl_info.cert_status)) { 196 if (IsCertStatusMinorError(ssl_info.cert_status)) {
197 request->ContinueDespiteLastError(); 197 request->ContinueDespiteLastError();
198 return; 198 return;
199 } 199 }
200 LOG(WARNING) << "SSL certificate error when fetching PAC script, aborting."; 200 LOG(WARNING) << "SSL certificate error when fetching PAC script, aborting.";
201 // Certificate errors are in same space as net errors. 201 // Certificate errors are in same space as net errors.
202 result_code_ = MapCertStatusToNetError(ssl_info.cert_status); 202 result_code_ = MapCertStatusToNetError(ssl_info.cert_status);
203 request->Cancel(); 203 request->Cancel();
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 // is still applicable. 316 // is still applicable.
317 if (cur_request_id_ != id) 317 if (cur_request_id_ != id)
318 return; 318 return;
319 319
320 DCHECK(cur_request_.get()); 320 DCHECK(cur_request_.get());
321 result_code_ = ERR_TIMED_OUT; 321 result_code_ = ERR_TIMED_OUT;
322 cur_request_->Cancel(); 322 cur_request_->Cancel();
323 } 323 }
324 324
325 } // namespace net 325 } // namespace net
OLDNEW
« no previous file with comments | « content/browser/ssl/ssl_policy.cc ('k') | net/url_request/url_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698