diff options
| author | Hidehiko Abe <hidehiko@chromium.org> | 2018-09-23 16:54:06 +0900 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-11-21 01:24:57 -0800 |
| commit | eab915e308bd0399e334e510faa85327ce118764 (patch) | |
| tree | dd5c0553558dba63694194e68cc805335586d35e /test_http_server.cc | |
| parent | abf1770963bfc3d8ff2e89a5fd77ffb02d88d05d (diff) | |
Revert "Partially Revert 2b9d241"
This reverts commit 71818c8409812c5a08124627c19aa8ea0625a72e.
This patch was created because the upstream update_engine was using
the new version of libchrome and the Chrome OS one was not. Now
that we are upreving libchrome on Chrome OS we can revert this.
BUG=b:37434548
TEST=Build
CQ-DEPEND=CL:1240033
Change-Id: I98b7d124212087292500701782de08b3d3ecc559
Reviewed-on: https://chromium-review.googlesource.com/1239818
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
Diffstat (limited to 'test_http_server.cc')
| -rw-r--r-- | test_http_server.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test_http_server.cc b/test_http_server.cc index 39a12ed5..cf156720 100644 --- a/test_http_server.cc +++ b/test_http_server.cc @@ -98,9 +98,11 @@ bool ParseRequest(int fd, HttpRequest* request) { request->raw_headers = headers; // Break header into lines. - vector<string> lines; - base::SplitStringUsingSubstr( - headers.substr(0, headers.length() - strlen(EOL EOL)), EOL, &lines); + vector<string> lines = base::SplitStringUsingSubstr( + headers.substr(0, headers.length() - strlen(EOL EOL)), + EOL, + base::TRIM_WHITESPACE, + base::SPLIT_WANT_ALL); // Decode URL line. vector<string> terms = base::SplitString(lines[0], base::kWhitespaceASCII, |