diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 13:28:44 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 13:28:44 +0000 |
| commit | e3fe59bfb0912596e8975f9c50b01683c19ee5d9 (patch) | |
| tree | 04b9c722b6f9db105acfc70bd286cb4f78c7d843 /net/http/http_auth_handler_basic.cc | |
| parent | d1cd0715ae8b15982b7ca46f4497eeddb4b73bca (diff) | |
| download | chromium_src-e3fe59bfb0912596e8975f9c50b01683c19ee5d9.zip chromium_src-e3fe59bfb0912596e8975f9c50b01683c19ee5d9.tar.gz chromium_src-e3fe59bfb0912596e8975f9c50b01683c19ee5d9.tar.bz2 | |
Extract name-value pair parsing from http_auth.cc (ChallengeTokenizer) into http_util.cc (NameValuePairsIterator). In preparation for re-use of name-value pair parsing in ChromeFrame (for X-UA-Compatible header).
BUG=None
TEST=net_unittests (HttpAuth* and HttpUtilTest.NameValuePairs*)
Review URL: http://codereview.chromium.org/3525004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_auth_handler_basic.cc')
| -rw-r--r-- | net/http/http_auth_handler_basic.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/net/http/http_auth_handler_basic.cc b/net/http/http_auth_handler_basic.cc index 355ce8b..054357a 100644 --- a/net/http/http_auth_handler_basic.cc +++ b/net/http/http_auth_handler_basic.cc @@ -32,18 +32,19 @@ bool HttpAuthHandlerBasic::Init(HttpAuth::ChallengeTokenizer* challenge) { bool HttpAuthHandlerBasic::ParseChallenge( HttpAuth::ChallengeTokenizer* challenge) { // Verify the challenge's auth-scheme. - if (!challenge->valid() || - !LowerCaseEqualsASCII(challenge->scheme(), "basic")) + if (!LowerCaseEqualsASCII(challenge->scheme(), "basic")) return false; + HttpUtil::NameValuePairsIterator parameters = challenge->param_pairs(); + // Extract the realm (may be missing). std::string realm; - while (challenge->GetNext()) { - if (LowerCaseEqualsASCII(challenge->name(), "realm")) - realm = challenge->unquoted_value(); + while (parameters.GetNext()) { + if (LowerCaseEqualsASCII(parameters.name(), "realm")) + realm = parameters.unquoted_value(); } - if (!challenge->valid()) + if (!parameters.valid()) return false; realm_ = realm; |