Escape non-ASCII response headers.

net/http/http_response_headers.cc

Index: net/http/http_response_headers.cc
diff --git a/net/http/http_response_headers.cc b/net/http/http_response_headers.cc
index e767ebb4fcd2900cb976b77a00ee828b3c4fd4b7..d8c710f6c5501a7d7340f1eacc745d2cb4356cda 100644
--- a/net/http/http_response_headers.cc
+++ b/net/http/http_response_headers.cc
@@ -1355,9 +1355,12 @@ base::Value* HttpResponseHeaders::NetLogCallback(
   std::string value;
   while (EnumerateHeaderLines(&iterator, &name, &value)) {
     std::string log_value = ElideHeaderValueForNetLog(log_level, name, value);
+    std::string escaped_name = EscapeNonASCII(name);
+    std::string escaped_value = EscapeNonASCII(log_value);
     headers->Append(
       new base::StringValue(
-          base::StringPrintf("%s: %s", name.c_str(), log_value.c_str())));
+          base::StringPrintf("%s: %s", escaped_name.c_str(),

[davidben, 2014/08/07 17:36:36]

Header names and values are "supposed to be" treated as latin1, so doing a
latin1 to utf8 might be better. Looks like we have a net/base/net_string_util.h
which defines a net::ConvertToUtf8 and kCharsetLatin1. There's other code in
net/ which uses ConvertToUtf8AndNormalize, so that seems fine.

[Elly Fong-Jones, 2014/08/07 19:41:37]

Acknowledged.

+                             escaped_value.c_str())));
   }
   dict->Set("headers", headers);
   return dict;