Landing Recent QUIC changes until 5/14/2016 02:25:25 UTC

net/quic/quic_stream_sequencer_buffer.cc

Index: net/quic/quic_stream_sequencer_buffer.cc
diff --git a/net/quic/quic_stream_sequencer_buffer.cc b/net/quic/quic_stream_sequencer_buffer.cc
index 0f56bf96db4908edd20755cc36fcb4f5fef476f7..352db230dc6fffa32c78fe00bf5aee0e9ecab3ba 100644
--- a/net/quic/quic_stream_sequencer_buffer.cc
+++ b/net/quic/quic_stream_sequencer_buffer.cc
@@ -106,26 +106,21 @@ QuicErrorCode QuicStreamSequencerBuffer::OnStreamData(
     *error_details =
         string("Beginning of received data overlaps with buffered data.\n") +
         "New frame range " + RangeDebugString(offset, offset + size) +
-        "\n"
-        "Currently received frames: " +
-        ReceivedFramesDebugString() +
-        "\n"
-        "Current gaps: " +
-        GapsDebugString() + "\n";
+        " with first 128 bytes: " +
+        string(data.data(), data.length() < 128 ? data.length() : 128) +
+        "\nCurrently received frames: " + ReceivedFramesDebugString() +
+        "\nCurrent gaps: " + GapsDebugString();
     return QUIC_OVERLAPPING_STREAM_DATA;
   }
   if (offset + size > current_gap->end_offset) {
     // End of new data overlaps with data after current gap.
     *error_details =
-        "End of received data overlaps with buffered data.\n"
-        "New frame range " +
-        RangeDebugString(offset, offset + size) +
-        "\n"
-        "Currently received frames: " +
-        ReceivedFramesDebugString() +
-        "\n"
-        "Current gaps: " +
-        GapsDebugString() + "\n";
+        string("End of received data overlaps with buffered data.\n") +
+        "New frame range " + RangeDebugString(offset, offset + size) +
+        " with first 128 bytes: " +
+        string(data.data(), data.length() < 128 ? data.length() : 128) +
+        "\nCurrently received frames: " + ReceivedFramesDebugString() +
+        "\nCurrent gaps: " + GapsDebugString();
     return QUIC_OVERLAPPING_STREAM_DATA;
   }