Landing Recent QUIC changes until 2015-11-09 20:32 UTC

net/quic/reliable_quic_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/reliable_quic_stream.h"
 
 #include "base/logging.h"
 #include "net/quic/iovector.h"
 #include "net/quic/quic_ack_listener_interface.h"
 #include "net/quic/quic_flags.h"
@@ skipping 82 matching lines @@
 
   bool flag_value = FLAGS_quic_fix_fin_accounting;
   if (!flag_value) {
     if (read_side_closed_) {
       DVLOG(1) << ENDPOINT << "Ignoring frame " << frame.stream_id;
       // The subclass does not want to read data:  blackhole the data.
       return;
     }
   }
 
-  if (!FLAGS_quic_stop_checking_for_mismatch_ids && frame.stream_id != id_) {
-    session_->connection()->SendConnectionClose(QUIC_INTERNAL_ERROR);
-    return;
-  }
-
   if (frame.fin) {
     fin_received_ = true;
     if (fin_sent_) {
       session_->StreamDraining(id_);
     }
   }
 
   if (flag_value) {
     if (read_side_closed_) {
       DVLOG(1) << ENDPOINT << "Ignoring data in frame " << frame.stream_id;
@@ skipping 61 matching lines @@
   // OnFinRead can be called due to a FIN flag in a headers block, so there may
   // have been no OnStreamFrame call with a FIN in the frame.
   fin_received_ = true;
   // If fin_sent_ is true, then CloseWriteSide has already been called, and the
   // stream will be destroyed by CloseReadSide, so don't need to call
   // StreamDraining.
   CloseReadSide();
 }
 
 void ReliableQuicStream::Reset(QuicRstStreamErrorCode error) {
-  DCHECK_NE(QUIC_STREAM_NO_ERROR, error);
   stream_error_ = error;
   // Sending a RstStream results in calling CloseStream.
   session()->SendRstStream(id(), error, stream_bytes_written_);
   rst_sent_ = true;
 }
 
 void ReliableQuicStream::CloseConnection(QuicErrorCode error) {
   session()->connection()->SendConnectionClose(error);
 }
 
@@ skipping 270 matching lines @@
   }
 }
 
 void ReliableQuicStream::UpdateSendWindowOffset(QuicStreamOffset new_window) {
   if (flow_controller_.UpdateSendWindowOffset(new_window)) {
     OnCanWrite();
   }
 }
 
 }  // namespace net