| Index: net/http/http_util.cc
|
| diff --git a/net/http/http_util.cc b/net/http/http_util.cc
|
| index 313da11a66f118b55043627976c6e7164f527c8b..37202a4adfbee399adbfe5deab8677413e9bd0bc 100644
|
| --- a/net/http/http_util.cc
|
| +++ b/net/http/http_util.cc
|
| @@ -383,19 +383,18 @@ bool HttpUtil::IsNonCoalescingHeader(std::string::const_iterator name_begin,
|
| // NOTE: "set-cookie2" headers do not support expires attributes, so we don't
|
| // have to list them here.
|
| const char* const kNonCoalescingHeaders[] = {
|
| - "date",
|
| - "expires",
|
| - "last-modified",
|
| - "location", // See bug 1050541 for details
|
| - "retry-after",
|
| - "set-cookie",
|
| - // The format of auth-challenges mixes both space separated tokens and
|
| - // comma separated properties, so coalescing on comma won't work.
|
| - "www-authenticate",
|
| - "proxy-authenticate",
|
| - // STS specifies that UAs must not process any STS headers after the first
|
| - // one.
|
| - "strict-transport-security"
|
| + "date", "expires", "last-modified",
|
| + "location", // See bug 1050541 for details
|
| + "retry-after", "set-cookie",
|
| + // The format of auth-challenges mixes both space separated tokens and
|
| + // comma separated properties, so coalescing on comma won't work.
|
| + "www-authenticate", "proxy-authenticate",
|
| + // STS specifies that UAs must not process any STS headers after the first
|
| + // one.
|
| + "strict-transport-security",
|
| + // The Clear-Site-Data header value is a JSON dictionary. JSON
|
| + // dictionaries are not closed under merging or splitting on commas.
|
| + "clear-site-data",
|
| };
|
| for (size_t i = 0; i < arraysize(kNonCoalescingHeaders); ++i) {
|
| if (base::LowerCaseEqualsASCII(base::StringPiece(name_begin, name_end),
|
|
|