| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/quic/spdy_utils.h" | 5 #include "net/quic/spdy_utils.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 | 122 |
| 123 if (std::any_of(name.begin(), name.end(), base::IsAsciiUpper<char>)) { | 123 if (std::any_of(name.begin(), name.end(), base::IsAsciiUpper<char>)) { |
| 124 DLOG(ERROR) << "Malformed header: Header name " << name | 124 DLOG(ERROR) << "Malformed header: Header name " << name |
| 125 << " contains upper-case characters."; | 125 << " contains upper-case characters."; |
| 126 return false; | 126 return false; |
| 127 } | 127 } |
| 128 | 128 |
| 129 auto iter = headers->find(name); | 129 auto iter = headers->find(name); |
| 130 if (iter == headers->end()) { | 130 if (iter == headers->end()) { |
| 131 (*headers)[name] = p.second; | 131 (*headers)[name] = p.second; |
| 132 } else if (name == "cookie") { | |
| 133 // Obeys section 8.1.2.5 in RFC 7540 for cookie reconstruction. | |
| 134 headers->ReplaceOrAppendHeader( | |
| 135 name, base::StringPrintf("%s; %s", iter->second.as_string().c_str(), | |
| 136 p.second.c_str())); | |
| 137 } else { | 132 } else { |
| 138 // This header had multiple values, so it must be reconstructed. | 133 // This header had multiple values, so it must be reconstructed. |
| 139 string value = base::StringPrintf( | 134 StringPiece v = iter->second; |
| 140 "%s%c%s", iter->second.as_string().c_str(), '\0', p.second.c_str()); | 135 string s(v.data(), v.length()); |
| 141 headers->ReplaceOrAppendHeader(name, value); | 136 if (name == "cookie") { |
| 137 // Obeys section 8.1.2.5 in RFC 7540 for cookie reconstruction. |
| 138 s.append("; "); |
| 139 } else { |
| 140 StringPiece("\0", 1).AppendToString(&s); |
| 141 } |
| 142 s.append(p.second); |
| 143 headers->ReplaceOrAppendHeader(name, s); |
| 142 } | 144 } |
| 143 } | 145 } |
| 144 | 146 |
| 145 if (ContainsKey(*headers, "content-length")) { | 147 if (ContainsKey(*headers, "content-length")) { |
| 146 // Check whether multiple values are consistent. | 148 // Check whether multiple values are consistent. |
| 147 StringPiece content_length_header = (*headers)["content-length"]; | 149 StringPiece content_length_header = (*headers)["content-length"]; |
| 148 vector<string> values = | 150 vector<string> values = |
| 149 base::SplitString(content_length_header, base::StringPiece("\0", 1), | 151 base::SplitString(content_length_header, base::StringPiece("\0", 1), |
| 150 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); | 152 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
| 151 for (const string& value : values) { | 153 for (const string& value : values) { |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 return GURL(GetUrlFromHeaderBlock(headers)).host(); | 250 return GURL(GetUrlFromHeaderBlock(headers)).host(); |
| 249 } | 251 } |
| 250 | 252 |
| 251 // static | 253 // static |
| 252 bool SpdyUtils::UrlIsValid(const SpdyHeaderBlock& headers) { | 254 bool SpdyUtils::UrlIsValid(const SpdyHeaderBlock& headers) { |
| 253 string url(GetUrlFromHeaderBlock(headers)); | 255 string url(GetUrlFromHeaderBlock(headers)); |
| 254 return url != "" && GURL(url).is_valid(); | 256 return url != "" && GURL(url).is_valid(); |
| 255 } | 257 } |
| 256 | 258 |
| 257 } // namespace net | 259 } // namespace net |
| OLD | NEW |