| Index: net/quic/quic_server_session.cc
|
| diff --git a/net/quic/quic_server_session.cc b/net/quic/quic_server_session.cc
|
| index 9d45162998516386a9fc22dfebf5835ad1299f04..efb0bcfec57a45e99f72d93e9e8dfe1428cef3f5 100644
|
| --- a/net/quic/quic_server_session.cc
|
| +++ b/net/quic/quic_server_session.cc
|
| @@ -19,7 +19,8 @@ QuicServerSession::QuicServerSession(const QuicConfig& config,
|
| : QuicSession(connection, config),
|
| visitor_(visitor),
|
| bandwidth_estimate_sent_to_client_(QuicBandwidth::Zero()),
|
| - last_server_config_update_time_(QuicTime::Zero()) {}
|
| + last_scup_time_(QuicTime::Zero()),
|
| + last_scup_sequence_number_(0) {}
|
|
|
| QuicServerSession::~QuicServerSession() {}
|
|
|
| @@ -68,14 +69,18 @@ void QuicServerSession::OnCongestionWindowChange(QuicTime now) {
|
| }
|
|
|
| // If not enough time has passed since the last time we sent an update to the
|
| - // client, then return early.
|
| + // client, or not enough packets have been sent, then return early.
|
| const QuicSentPacketManager& sent_packet_manager =
|
| connection()->sent_packet_manager();
|
| int64 srtt_ms =
|
| sent_packet_manager.GetRttStats()->SmoothedRtt().ToMilliseconds();
|
| - int64 now_ms = now.Subtract(last_server_config_update_time_).ToMilliseconds();
|
| + int64 now_ms = now.Subtract(last_scup_time_).ToMilliseconds();
|
| + int64 packets_since_last_scup =
|
| + connection()->sequence_number_of_last_sent_packet() -
|
| + last_scup_sequence_number_;
|
| if (now_ms < (kMinIntervalBetweenServerConfigUpdatesRTTs * srtt_ms) ||
|
| - now_ms < kMinIntervalBetweenServerConfigUpdatesMs) {
|
| + now_ms < kMinIntervalBetweenServerConfigUpdatesMs ||
|
| + packets_since_last_scup < kMinPacketsBetweenServerConfigUpdates) {
|
| return;
|
| }
|
|
|
| @@ -134,7 +139,9 @@ void QuicServerSession::OnCongestionWindowChange(QuicTime now) {
|
| }
|
|
|
| crypto_stream_->SendServerConfigUpdate(&cached_network_params);
|
| - last_server_config_update_time_ = now;
|
| + last_scup_time_ = now;
|
| + last_scup_sequence_number_ =
|
| + connection()->sequence_number_of_last_sent_packet();
|
| }
|
|
|
| bool QuicServerSession::ShouldCreateIncomingDataStream(QuicStreamId id) {
|
|
|