Land Recent QUIC changes.

net/quic/quic_session.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_session.h"
 
 #include "base/stl_util.h"
 #include "net/quic/crypto/proof_verifier.h"
 #include "net/quic/quic_connection.h"
 #include "net/ssl/ssl_info.h"
@@ skipping 410 matching lines @@
     return NULL;
   }
 
   implicitly_created_streams_.erase(stream_id);
   if (stream_id > largest_peer_created_stream_id_) {
     // TODO(rch) add unit test for this
     if (stream_id - largest_peer_created_stream_id_ > kMaxStreamIdDelta) {
       connection()->SendConnectionClose(QUIC_INVALID_STREAM_ID);
       return NULL;
     }
-    if (largest_peer_created_stream_id_ != 0) {
-      for (QuicStreamId id = largest_peer_created_stream_id_ + 2;
-           id < stream_id;
-           id += 2) {
-        implicitly_created_streams_.insert(id);
-      }
+    if (largest_peer_created_stream_id_ == 0) {
+      largest_peer_created_stream_id_= 1;
+    }
+    for (QuicStreamId id = largest_peer_created_stream_id_ + 2;
+         id < stream_id;
+         id += 2) {
+      implicitly_created_streams_.insert(id);
     }
     largest_peer_created_stream_id_ = stream_id;
   }
   ReliableQuicStream* stream = CreateIncomingReliableStream(stream_id);
   if (stream == NULL) {
     return NULL;
   }
   ActivateStream(stream);
   return stream;
 }
@@ skipping 39 matching lines @@
   NOTIMPLEMENTED();
   return false;
 }
 
 void QuicSession::PostProcessAfterData() {
   STLDeleteElements(&closed_streams_);
   closed_streams_.clear();
 }
 
 }  // namespace net