diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 13:12:04 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 13:12:04 +0000 |
| commit | 79cb5c1739afa979cb0d5aa3701f128c6a50dde5 (patch) | |
| tree | 8e46e6ee56d1b0a8b339a358a2418a83f354a436 /net/socket_stream | |
| parent | 89b1769644f8a140ef663db69156a651422f50db (diff) | |
| download | chromium_src-79cb5c1739afa979cb0d5aa3701f128c6a50dde5.zip chromium_src-79cb5c1739afa979cb0d5aa3701f128c6a50dde5.tar.gz chromium_src-79cb5c1739afa979cb0d5aa3701f128c6a50dde5.tar.bz2 | |
Change AuthChallengeInfo to better represent underlying encodings.
* Use a HostPortPair to indicate the challenger info. This may be a punycode-encoded host.
* scheme is always ASCII encoded and a string
* realm is converted to UTF-16 rather than a wstring. Over the wire this is usually ASCII, can be ISO-8859-1 encoded as it's a quoted string, and could potentially be other encodings as specified by RFC 2047.
BUG=95692
TEST=http://greenbytes.de/tech/tc/httpauth/simplebasicrealmiso88591.asis should display an a with an umlaut.
Review URL: http://codereview.chromium.org/7569015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index bed9f2c..159779a 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -851,11 +851,10 @@ int SocketStream::DoReadTunnelHeadersComplete(int result) { DCHECK(!proxy_info_.is_empty()); auth_info_ = new AuthChallengeInfo; auth_info_->is_proxy = true; - auth_info_->host_and_port = - ASCIIToWide(proxy_info_.proxy_server().host_port_pair().ToString()); - auth_info_->scheme = ASCIIToWide( - HttpAuth::SchemeToString(auth_handler_->auth_scheme())); - auth_info_->realm = ASCIIToWide(auth_handler_->realm()); + auth_info_->challenger = proxy_info_.proxy_server().host_port_pair(); + auth_info_->scheme = HttpAuth::SchemeToString( + auth_handler_->auth_scheme()); + auth_info_->realm = auth_handler_->realm(); // Wait until RestartWithAuth or Close is called. MessageLoop::current()->PostTask( FROM_HERE, |