diff options
| author | ttuttle <ttuttle@chromium.org> | 2015-05-14 18:28:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-15 01:28:20 +0000 |
| commit | 23fdb7b4ed86ee9f63b16a3b432fa2c721432bd2 (patch) | |
| tree | c588b5338738541f02cfab69a8b213670127c744 /net/server | |
| parent | c0c828496a25acd34b85985b412799933a36f1ff (diff) | |
| download | chromium_src-23fdb7b4ed86ee9f63b16a3b432fa2c721432bd2.zip chromium_src-23fdb7b4ed86ee9f63b16a3b432fa2c721432bd2.tar.gz chromium_src-23fdb7b4ed86ee9f63b16a3b432fa2c721432bd2.tar.bz2 | |
Collect all ConnectionAttempts from both sockets in TransportConnectJob.
Before, the TransportConnectJob simply inferred that, if the main socket
failed to connect, the address it was using was the last address in the
list. With this change, the TCPClientSocket actually tracks all of the
connection attempts made (as it tries each address in the list), and the
TransportConnectJob copies the attempts from both the main and fallback
sockets and records all of them in the ClientSocketHandle in
GetAdditionalErrorState.
BUG=480565
TBR=jam
Review URL: https://codereview.chromium.org/1096203006
Cr-Commit-Position: refs/heads/master@{#330012}
Diffstat (limited to 'net/server')
| -rw-r--r-- | net/server/http_server_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc index a6070e8..c2426a3 100644 --- a/net/server/http_server_unittest.cc +++ b/net/server/http_server_unittest.cc @@ -497,6 +497,11 @@ class MockStreamSocket : public StreamSocket { bool WasNpnNegotiated() const override { return false; } NextProto GetNegotiatedProtocol() const override { return kProtoUnknown; } bool GetSSLInfo(SSLInfo* ssl_info) override { return false; } + void GetConnectionAttempts(ConnectionAttempts* out) const override { + out->clear(); + } + void ClearConnectionAttempts() override {} + void AddConnectionAttempts(const ConnectionAttempts& attempts) override {} // Socket int Read(IOBuffer* buf, |