Land Recent QUIC changes.

net/quic/quic_stream_sequencer.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/quic_stream_sequencer.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/logging.h"
@@ skipping 56 matching lines @@
   if (!WillAcceptStreamFrame(frame)) {
     // This should not happen, as WillAcceptFrame should be called before
     // OnStreamFrame.  Error handling should be done by the caller.
     return false;
   }
   if (IsDuplicate(frame)) {
     // Silently ignore duplicates.
     return true;
   }
 
+  if (frame.fin) {
+    CloseStreamAtOffset(frame.offset + frame.data.size());
+  }
+
   QuicStreamOffset byte_offset = frame.offset;
   const char* data = frame.data.data();
   size_t data_len = frame.data.size();
 
+  if (data_len == 0) {
+    // TODO(rch): Close the stream if there was no data and no fin.
+    return true;
+  }
+
   if (byte_offset == num_bytes_consumed_) {
     DVLOG(1) << "Processing byte offset " << byte_offset;
     size_t bytes_consumed = stream_->ProcessRawData(data, data_len);
     num_bytes_consumed_ += bytes_consumed;
 
     if (MaybeCloseStream()) {
       return true;
     }
     if (bytes_consumed > data_len) {
       stream_->Close(QUIC_SERVER_ERROR_PROCESSING_STREAM);
@@ skipping 161 matching lines @@
     } else {
       string new_data = it->second.substr(bytes_consumed);
       frames_.erase(it);
       frames_.insert(make_pair(num_bytes_consumed_, new_data));
       return;
     }
   }
 }
 
 }  // namespace net