diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 15:51:13 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 15:51:13 +0000 |
| commit | 931fae8fbb1766629f2d82d772c7f612b440c4b2 (patch) | |
| tree | cb35c84c741a1733184cd9d4f49d417aa7f0e113 | |
| parent | d2ebf94e10cca05310a76717e416d90ba66fafbd (diff) | |
| download | chromium_src-931fae8fbb1766629f2d82d772c7f612b440c4b2.zip chromium_src-931fae8fbb1766629f2d82d772c7f612b440c4b2.tar.gz chromium_src-931fae8fbb1766629f2d82d772c7f612b440c4b2.tar.bz2 | |
Fix bug which causes proxy authentication requests
to crash Debug builds.
BUG=39329
TEST=Mocking a proxy isn't trivial. Ideas?
Review URL: http://codereview.chromium.org/1355001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43483 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/login_prompt.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc index b568785..672f689 100644 --- a/chrome/browser/login_prompt.cc +++ b/chrome/browser/login_prompt.cc @@ -400,15 +400,15 @@ class LoginDialogTask : public Task { dialog_form.scheme = PasswordForm::SCHEME_OTHER; } std::string host_and_port(WideToASCII(auth_info_->host_and_port)); - if (net::GetHostAndPort(request_url_) != host_and_port) { - dialog_form.origin = GURL(); - NOTREACHED(); // crbug.com/32718 - } else if (auth_info_->is_proxy) { + if (auth_info_->is_proxy) { std::string origin = host_and_port; // We don't expect this to already start with http:// or https://. DCHECK(origin.find("http://") != 0 && origin.find("https://") != 0); origin = std::string("http://") + origin; dialog_form.origin = GURL(origin); + } else if (net::GetHostAndPort(request_url_) != host_and_port) { + dialog_form.origin = GURL(); + NOTREACHED(); // crbug.com/32718 } else { dialog_form.origin = GURL(request_url_.scheme() + "://" + host_and_port); } |