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

Unified Diff: net/http/http_content_disposition.cc

Issue 9317018: referrer_charset is a lie. It's really the user's default_charset. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_content_disposition.h ('k') | net/http/http_content_disposition_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_content_disposition.cc
===================================================================
--- net/http/http_content_disposition.cc (revision 119865)
+++ net/http/http_content_disposition.cc (working copy)
@@ -12,9 +12,9 @@
namespace net {
HttpContentDisposition::HttpContentDisposition(
- const std::string& header, const std::string& referrer_charset)
+ const std::string& header, const std::string& default_charset)
: type_(INLINE) {
- Parse(header, referrer_charset);
+ Parse(header, default_charset);
}
HttpContentDisposition::~HttpContentDisposition() {
@@ -61,7 +61,7 @@
// ext-token = <the characters in token, followed by "*">
//
void HttpContentDisposition::Parse(const std::string& header,
- const std::string& referrer_charset) {
+ const std::string& default_charset) {
DCHECK(type_ == INLINE);
DCHECK(filename_.empty());
@@ -77,11 +77,11 @@
if (filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
iter.name_end(),
"filename")) {
- DecodeFilenameValue(iter.value(), referrer_charset, &filename);
+ DecodeFilenameValue(iter.value(), default_charset, &filename);
} else if (filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
iter.name_end(),
"name")) {
- DecodeFilenameValue(iter.value(), referrer_charset, &filename);
+ DecodeFilenameValue(iter.value(), default_charset, &filename);
} else if (ext_filename.empty() && LowerCaseEqualsASCII(iter.name_begin(),
iter.name_end(),
"filename*")) {
« no previous file with comments | « net/http/http_content_disposition.h ('k') | net/http/http_content_disposition_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698