| Index: net/http/http_request_headers.cc
|
| diff --git a/net/http/http_request_headers.cc b/net/http/http_request_headers.cc
|
| index ec01446ef98a2cd61fad7ab0eca954041ffb53f7..235281bebe93df1ed6287405ec845f073e437ea7 100644
|
| --- a/net/http/http_request_headers.cc
|
| +++ b/net/http/http_request_headers.cc
|
| @@ -117,7 +117,7 @@ void HttpRequestHeaders::RemoveHeader(const base::StringPiece& key) {
|
|
|
| void HttpRequestHeaders::AddHeaderFromString(
|
| const base::StringPiece& header_line) {
|
| - DCHECK_EQ(std::string::npos, header_line.find("\r\n"))
|
| + DCHECK_EQ(std::string::npos, header_line.find_first_of("\r\n"))
|
| << "\"" << header_line << "\" contains CRLF.";
|
|
|
| const std::string::size_type key_end_index = header_line.find(":");
|
| @@ -161,7 +161,7 @@ void HttpRequestHeaders::AddHeaderFromString(
|
|
|
| void HttpRequestHeaders::AddHeadersFromString(
|
| const base::StringPiece& headers) {
|
| - for (const base::StringPiece& header : base::SplitStringPieceUsingSubstr(
|
| + for (const base::StringPiece& header : base::SplitStringPiece(
|
| headers, "\r\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
|
| AddHeaderFromString(header);
|
| }
|
|
|