diff options
author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 03:06:54 +0000 |
---|---|---|
committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-22 03:06:54 +0000 |
commit | 8f3c963473091104513c05328fe2fe98989e8339 (patch) | |
tree | 6dcf38d7305ee622a13b56c5f30143eb833148ef /net/proxy/proxy_script_fetcher.h | |
parent | 0f3dfb420337c569091ac303081c30c9e060f842 (diff) | |
download | chromium_src-8f3c963473091104513c05328fe2fe98989e8339.zip chromium_src-8f3c963473091104513c05328fe2fe98989e8339.tar.gz chromium_src-8f3c963473091104513c05328fe2fe98989e8339.tar.bz2 |
Respect the charset specified in PAC file responses.
I have updated the documentation of ProxyResolver and ProxyScriptFetcher to indicate that the response must always be given as UTF8. So ProxyScriptFetcher is responsible for any charset conversions internally.
This CL also adds a unit-test to make sure that content-encodings are respected (like gzip). This was not previously broken, but it is a related area (and wasn't being tested.)
BUG=http://crbug.com/22310
Review URL: http://codereview.chromium.org/210028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26790 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_script_fetcher.h')
-rw-r--r-- | net/proxy/proxy_script_fetcher.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/proxy/proxy_script_fetcher.h b/net/proxy/proxy_script_fetcher.h index e88ab6b..cbdb911 100644 --- a/net/proxy/proxy_script_fetcher.h +++ b/net/proxy/proxy_script_fetcher.h @@ -26,9 +26,9 @@ class ProxyScriptFetcher { // Downloads the given PAC URL, and invokes |callback| on completion. // On success |callback| is executed with a result code of OK, and a - // string of the response bytes. On failure, the result bytes is an empty - // string, and the result code is a network error. Some special network - // errors that may occur are: + // string of the response bytes (as UTF8). On failure, the result bytes is + // an empty string, and the result code is a network error. Some special + // network errors that may occur are: // // ERR_TIMED_OUT -- the fetch took too long to complete. // ERR_FILE_TOO_BIG -- the response's body was too large. @@ -39,7 +39,7 @@ class ProxyScriptFetcher { // deleting |this|), then no callback is invoked. // // Only one fetch is allowed to be outstanding at a time. - virtual int Fetch(const GURL& url, std::string* bytes, + virtual int Fetch(const GURL& url, std::string* utf8_bytes, CompletionCallback* callback) = 0; // Aborts the in-progress fetch (if any). |