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

Side by Side Diff: net/http/http_auth_handler_basic.cc

Issue 266053002: Implement alternative string conversion functions in net/ on Android, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove GN changes Created 6 years, 7 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 | « net/cert/x509_cert_types_mac.cc ('k') | net/http/http_auth_handler_digest.cc » ('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/http/http_auth_handler_basic.h" 5 #include "net/http/http_auth_handler_basic.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 25 matching lines...) Expand all
36 // well, see http://crbug.com/25790. 36 // well, see http://crbug.com/25790.
37 bool ParseRealm(const HttpAuthChallengeTokenizer& tokenizer, 37 bool ParseRealm(const HttpAuthChallengeTokenizer& tokenizer,
38 std::string* realm) { 38 std::string* realm) {
39 CHECK(realm); 39 CHECK(realm);
40 realm->clear(); 40 realm->clear();
41 HttpUtil::NameValuePairsIterator parameters = tokenizer.param_pairs(); 41 HttpUtil::NameValuePairsIterator parameters = tokenizer.param_pairs();
42 while (parameters.GetNext()) { 42 while (parameters.GetNext()) {
43 if (!LowerCaseEqualsASCII(parameters.name(), "realm")) 43 if (!LowerCaseEqualsASCII(parameters.name(), "realm"))
44 continue; 44 continue;
45 45
46 if (!net::ConvertLatin1ToUtf8AndNormalize(parameters.value(), realm)) 46 if (!net::ConvertToUtf8AndNormalize(parameters.value(), kCharsetLatin1,
47 realm)) {
47 return false; 48 return false;
49 }
48 } 50 }
49 return parameters.valid(); 51 return parameters.valid();
50 } 52 }
51 53
52 } // namespace 54 } // namespace
53 55
54 bool HttpAuthHandlerBasic::Init(HttpAuthChallengeTokenizer* challenge) { 56 bool HttpAuthHandlerBasic::Init(HttpAuthChallengeTokenizer* challenge) {
55 auth_scheme_ = HttpAuth::AUTH_SCHEME_BASIC; 57 auth_scheme_ = HttpAuth::AUTH_SCHEME_BASIC;
56 score_ = 1; 58 score_ = 1;
57 properties_ = 0; 59 properties_ = 0;
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // TODO(cbentzel): Move towards model of parsing in the factory 117 // TODO(cbentzel): Move towards model of parsing in the factory
116 // method and only constructing when valid. 118 // method and only constructing when valid.
117 scoped_ptr<HttpAuthHandler> tmp_handler(new HttpAuthHandlerBasic()); 119 scoped_ptr<HttpAuthHandler> tmp_handler(new HttpAuthHandlerBasic());
118 if (!tmp_handler->InitFromChallenge(challenge, target, origin, net_log)) 120 if (!tmp_handler->InitFromChallenge(challenge, target, origin, net_log))
119 return ERR_INVALID_RESPONSE; 121 return ERR_INVALID_RESPONSE;
120 handler->swap(tmp_handler); 122 handler->swap(tmp_handler);
121 return OK; 123 return OK;
122 } 124 }
123 125
124 } // namespace net 126 } // namespace net
OLDNEW
« no previous file with comments | « net/cert/x509_cert_types_mac.cc ('k') | net/http/http_auth_handler_digest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698