| Index: net/quic/core/quic_crypto_server_stream.cc
|
| diff --git a/net/quic/core/quic_crypto_server_stream.cc b/net/quic/core/quic_crypto_server_stream.cc
|
| index bd87a2423c834a9bcf94d61d7696f77e18671243..1d2ac111434bb9f7b90c41a99cd1d6622895c938 100644
|
| --- a/net/quic/core/quic_crypto_server_stream.cc
|
| +++ b/net/quic/core/quic_crypto_server_stream.cc
|
| @@ -290,6 +290,7 @@ void QuicCryptoServerStream::SendServerConfigUpdate(
|
| std::unique_ptr<SendServerConfigUpdateCallback> cb(
|
| new SendServerConfigUpdateCallback(this));
|
| send_server_config_update_cb_ = cb.get();
|
| +
|
| crypto_config_->BuildServerConfigUpdateMessage(
|
| session()->connection()->version(), chlo_hash_,
|
| previous_source_address_tokens_,
|
| @@ -297,7 +298,11 @@ void QuicCryptoServerStream::SendServerConfigUpdate(
|
| session()->connection()->peer_address().address(),
|
| session()->connection()->clock(),
|
| session()->connection()->random_generator(), compressed_certs_cache_,
|
| - *crypto_negotiated_params_, cached_network_params, std::move(cb));
|
| + *crypto_negotiated_params_, cached_network_params,
|
| + (session()->config()->HasReceivedConnectionOptions()
|
| + ? session()->config()->ReceivedConnectionOptions()
|
| + : QuicTagVector()),
|
| + std::move(cb));
|
| return;
|
| }
|
|
|
| @@ -310,6 +315,9 @@ void QuicCryptoServerStream::SendServerConfigUpdate(
|
| session()->connection()->clock(),
|
| session()->connection()->random_generator(), compressed_certs_cache_,
|
| *crypto_negotiated_params_, cached_network_params,
|
| + (session()->config()->HasReceivedConnectionOptions()
|
| + ? session()->config()->ReceivedConnectionOptions()
|
| + : QuicTagVector()),
|
| &server_config_update_message)) {
|
| DVLOG(1) << "Server: Failed to build server config update (SCUP)!";
|
| return;
|
|
|