summaryrefslogtreecommitdiff
path: root/chromium/net/server
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-03-11 11:32:04 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-03-18 13:40:17 +0000
commit31ccca0778db85c159634478b4ec7997f6704860 (patch)
tree3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/net/server
parent248b70b82a40964d5594eb04feca0fa36716185d (diff)
downloadqtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/net/server')
-rw-r--r--chromium/net/server/http_server_fuzzer.cc2
-rw-r--r--chromium/net/server/http_server_request_info.h4
-rw-r--r--chromium/net/server/web_socket_encoder.cc4
3 files changed, 5 insertions, 5 deletions
diff --git a/chromium/net/server/http_server_fuzzer.cc b/chromium/net/server/http_server_fuzzer.cc
index 9f7aa9c1344..0509bde4ca7 100644
--- a/chromium/net/server/http_server_fuzzer.cc
+++ b/chromium/net/server/http_server_fuzzer.cc
@@ -95,7 +95,7 @@ class WaitTillHttpCloseDelegate : public net::HttpServer::Delegate {
//
// |data| is used to create a FuzzedServerSocket.
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
- net::TestNetLog test_net_log;
+ net::RecordingTestNetLog test_net_log;
FuzzedDataProvider data_provider(data, size);
std::unique_ptr<net::ServerSocket> server_socket(
diff --git a/chromium/net/server/http_server_request_info.h b/chromium/net/server/http_server_request_info.h
index 014142cac74..9eeb10d70ca 100644
--- a/chromium/net/server/http_server_request_info.h
+++ b/chromium/net/server/http_server_request_info.h
@@ -46,8 +46,8 @@ class HttpServerRequestInfo {
// A map of the names -> values for HTTP headers. These should always
// contain lower case field names.
- typedef std::map<std::string, std::string> HeadersMap;
- mutable HeadersMap headers;
+ using HeadersMap = std::map<std::string, std::string>;
+ HeadersMap headers;
};
} // namespace net
diff --git a/chromium/net/server/web_socket_encoder.cc b/chromium/net/server/web_socket_encoder.cc
index 772cf7d6cbe..e6d4c64248b 100644
--- a/chromium/net/server/web_socket_encoder.cc
+++ b/chromium/net/server/web_socket_encoder.cc
@@ -180,7 +180,7 @@ void EncodeFrameHybi17(base::StringPiece message,
} else {
frame.insert(frame.end(), data, data + data_length);
}
- *output = std::string(&frame[0], frame.size());
+ *output = std::string(frame.data(), frame.size());
}
} // anonymous namespace
@@ -329,7 +329,7 @@ bool WebSocketEncoder::Inflate(std::string* message) {
}
*message =
- output.size() ? std::string(&output[0], output.size()) : std::string();
+ output.size() ? std::string(output.data(), output.size()) : std::string();
return true;
}