Update HPACK implementation to draft-09

net/spdy/hpack_decoder_test.cc

 // Copyright 2014 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/spdy/hpack_decoder.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 81 matching lines @@
 
   void expectEntry(size_t index, size_t size, const string& name,
                    const string& value) {
     HpackEntry* entry = decoder_peer_.header_table()->GetByIndex(index);
     EXPECT_EQ(name, entry->name()) << "index " << index;
     EXPECT_EQ(value, entry->value());
     EXPECT_EQ(size, entry->Size());
     EXPECT_EQ(index, decoder_peer_.header_table()->IndexOf(entry));
   }
 
-  void expectStaticEntry(size_t index) {
-    HpackEntry* entry = decoder_peer_.header_table()->GetByIndex(index);
-    EXPECT_TRUE(entry->IsStatic()) << "index " << index;
-  }
-
   HpackDecoder decoder_;
   test::HpackDecoderPeer decoder_peer_;
 };
 
 TEST_F(HpackDecoderTest, HandleControlFrameHeadersData) {
   // Strings under threshold are concatenated in the buffer.
   EXPECT_TRUE(decoder_.HandleControlFrameHeadersData(
       0, "small string one", 16));
   EXPECT_TRUE(decoder_.HandleControlFrameHeadersData(
       0, "small string two", 16));
   // A string which would push the buffer over the threshold is refused.
   EXPECT_FALSE(decoder_.HandleControlFrameHeadersData(
       0, "fails", kMaxDecodeBufferSize - 32 + 1));
 
   EXPECT_EQ(decoder_peer_.headers_block_buffer(),
             "small string onesmall string two");
 }
 
 TEST_F(HpackDecoderTest, HandleControlFrameHeadersComplete) {
-  // Decode a block which toggles two static headers into the reference set.
+  // Decode a header block.  Since there is no reference set, these header
+  // fields should not show up in the next block unless explicitly encoded.

[Johnny, 2014/08/06 15:04:49]

Can probably just strike all mentions of "reference set" from the record.

[Bence, 2014/08/06 20:20:22]

Should I also remove the next line?
EXPECT_TRUE(DecodeHeaderBlock("\x82\x86"));

[Johnny, 2014/08/07 17:02:22]

I'd probably move "\x82\x86" (corrected for the right indices) into L128's
HandleControlFrameHeadersData, just so that :method and :path expectations don't
need to be removed.

I'm also fine with just dropping it.

[Bence, 2014/08/08 13:57:56]

Done.

   EXPECT_TRUE(DecodeHeaderBlock("\x82\x86"));
 
   decoder_peer_.set_cookie_value("foobar=baz");
 
-  // Headers in the reference set should be emitted.
   // Incremental cookie buffer should be emitted and cleared.
   decoder_.HandleControlFrameHeadersData(0, NULL, 0);
   decoder_.HandleControlFrameHeadersComplete(0);
 
   EXPECT_THAT(decoded_block(), ElementsAre(
-      Pair(":method", "GET"),
-      Pair(":path", "/index.html"),
       Pair("cookie", "foobar=baz")));
   EXPECT_EQ(decoder_peer_.cookie_value(), "");
 }
 
 TEST_F(HpackDecoderTest, HandleHeaderRepresentation) {
   // All cookie crumbs are joined.
   decoder_peer_.HandleHeaderRepresentation("cookie", " part 1");
   decoder_peer_.HandleHeaderRepresentation("cookie", "part 2 ");
   decoder_peer_.HandleHeaderRepresentation("cookie", "part3");
 
@@ skipping 63 matching lines @@
 // Decoding an encoded name with an invalid index should fail.
 TEST_F(HpackDecoderTest, DecodeNextNameInvalidIndex) {
   // One more than the number of static table entries.
   HpackInputStream input_stream(kLiteralBound, "\x3e");
 
   StringPiece string_piece;
   EXPECT_FALSE(decoder_peer_.DecodeNextName(&input_stream, &string_piece));
 }
 
 // Decoding an indexed header should toggle the index's presence in
 // the reference set, making a copy of static table entries if

[Johnny, 2014/08/06 15:04:50]

Comment update.

[Bence, 2014/08/06 20:20:22]

Done.

 // necessary. It should also emit the header if toggled on (and only
 // as many times as it was toggled on).
 TEST_F(HpackDecoderTest, IndexedHeaderBasic) {
-  // Toggle on static table entry #2 (and make a copy at index #1),
-  // then toggle on static table entry #5 (which is now #6 because of
-  // the copy of #2).
+  // Reference static table entries #2 and #5.
   std::map<string, string> header_set1 =
-      DecodeBlockExpectingSuccess("\x82\x86");
+      DecodeBlockExpectingSuccess("\x82\x85");
   std::map<string, string> expected_header_set1;
   expected_header_set1[":method"] = "GET";
   expected_header_set1[":path"] = "/index.html";
   EXPECT_EQ(expected_header_set1, header_set1);
 
-  std::map<string, string> expected_header_set2;
-  expected_header_set2[":path"] = "/index.html";
-  // Toggle off the copy of static table entry #5.
+  // Reference static table entry #2.
   std::map<string, string> header_set2 =
       DecodeBlockExpectingSuccess("\x82");
+  std::map<string, string> expected_header_set2;
+  expected_header_set2[":method"] = "GET";
   EXPECT_EQ(expected_header_set2, header_set2);
 }
 
 // Test a too-large indexed header.
 TEST_F(HpackDecoderTest, InvalidIndexedHeader) {
   // High-bit set, and a prefix of one more than the number of static entries.
   EXPECT_FALSE(DecodeHeaderBlock(StringPiece("\xbe", 1)));
 }
 
 TEST_F(HpackDecoderTest, ContextUpdateMaximumSize) {
   EXPECT_EQ(kDefaultHeaderTableSizeSetting,
             decoder_peer_.header_table()->max_size());
   string input;
   {
     // Maximum-size update with size 126. Succeeds.
     HpackOutputStream output_stream;
-    output_stream.AppendPrefix(kEncodingContextOpcode);
-    output_stream.AppendPrefix(kEncodingContextNewMaximumSize);
+    output_stream.AppendPrefix(kHeaderTableSizeUpdateOpcode);
     output_stream.AppendUint32(126);
 
     output_stream.TakeString(&input);
     EXPECT_TRUE(DecodeHeaderBlock(StringPiece(input)));
     EXPECT_EQ(126u, decoder_peer_.header_table()->max_size());
   }
   {
     // Maximum-size update with kDefaultHeaderTableSizeSetting. Succeeds.
     HpackOutputStream output_stream;
-    output_stream.AppendPrefix(kEncodingContextOpcode);
-    output_stream.AppendPrefix(kEncodingContextNewMaximumSize);
+    output_stream.AppendPrefix(kHeaderTableSizeUpdateOpcode);
     output_stream.AppendUint32(kDefaultHeaderTableSizeSetting);
 
     output_stream.TakeString(&input);
     EXPECT_TRUE(DecodeHeaderBlock(StringPiece(input)));
     EXPECT_EQ(kDefaultHeaderTableSizeSetting,
               decoder_peer_.header_table()->max_size());
   }
   {
     // Maximum-size update with kDefaultHeaderTableSizeSetting + 1. Fails.
     HpackOutputStream output_stream;
-    output_stream.AppendPrefix(kEncodingContextOpcode);
-    output_stream.AppendPrefix(kEncodingContextNewMaximumSize);
+    output_stream.AppendPrefix(kHeaderTableSizeUpdateOpcode);
     output_stream.AppendUint32(kDefaultHeaderTableSizeSetting + 1);
 
     output_stream.TakeString(&input);
     EXPECT_FALSE(DecodeHeaderBlock(StringPiece(input)));
     EXPECT_EQ(kDefaultHeaderTableSizeSetting,
               decoder_peer_.header_table()->max_size());
   }
 }
 
-TEST_F(HpackDecoderTest, ContextUpdateClearReferenceSet) {
-  // Toggle on a couple of headers.
-  std::map<string, string> header_set1 =
-      DecodeBlockExpectingSuccess("\x82\x86");
-  std::map<string, string> expected_header_set1;
-  expected_header_set1[":method"] = "GET";
-  expected_header_set1[":path"] = "/index.html";
-  EXPECT_EQ(expected_header_set1, header_set1);
-
-  // Send a context update to clear the reference set.
-  std::map<string, string> header_set2 =
-      DecodeBlockExpectingSuccess("\x30");
-  std::map<string, string> expected_header_set2;
-  EXPECT_EQ(expected_header_set2, header_set2);
-}
-
 // Decoding two valid encoded literal headers with no indexing should
 // work.
 TEST_F(HpackDecoderTest, LiteralHeaderNoIndexing) {
   // First header with indexed name, second header with string literal
   // name.
   const char input[] = "\x04\x0c/sample/path\x00\x06:path2\x0e/sample/path/2";
   std::map<string, string> header_set =
       DecodeBlockExpectingSuccess(StringPiece(input, arraysize(input) - 1));
 
   std::map<string, string> expected_header_set;
   expected_header_set[":path"] = "/sample/path";
   expected_header_set[":path2"] = "/sample/path/2";
   EXPECT_EQ(expected_header_set, header_set);
 }
 
 // Decoding two valid encoded literal headers with incremental
-// indexing and string literal names should work and add the headers
-// to the reference set.
+// indexing and string literal names should work.
 TEST_F(HpackDecoderTest, LiteralHeaderIncrementalIndexing) {
   const char input[] = "\x44\x0c/sample/path\x40\x06:path2\x0e/sample/path/2";
   std::map<string, string> header_set =
       DecodeBlockExpectingSuccess(StringPiece(input, arraysize(input) - 1));
 
   std::map<string, string> expected_header_set;
   expected_header_set[":path"] = "/sample/path";
   expected_header_set[":path2"] = "/sample/path/2";
   EXPECT_EQ(expected_header_set, header_set);
-
-  // Decoding an empty string should just return the reference set.
-  std::map<string, string> header_set2 = DecodeBlockExpectingSuccess("");
-  EXPECT_EQ(expected_header_set, header_set2);
 }
 
 TEST_F(HpackDecoderTest, LiteralHeaderWithIndexingInvalidNameIndex) {
   decoder_.ApplyHeaderTableSizeSetting(0);
 
   // Name is the last static index. Works.
   EXPECT_TRUE(DecodeHeaderBlock(StringPiece("\x7d\x03ooo")));
   // Name is one beyond the last static index. Fails.
   EXPECT_FALSE(DecodeHeaderBlock(StringPiece("\x7e\x03ooo")));
 }
@@ skipping 23 matching lines @@
   expected_header_set[":authority"] = "www.example.com";
 
   string encoded_header_set;
   EXPECT_TRUE(encoder.EncodeHeaderSet(
       expected_header_set, &encoded_header_set));
 
   EXPECT_TRUE(DecodeHeaderBlock(encoded_header_set));
   EXPECT_EQ(expected_header_set, decoded_block());
 }
 
-TEST_F(HpackDecoderTest, SectionD3RequestHuffmanExamples) {
+TEST_F(HpackDecoderTest, SectionD4RequestHuffmanExamples) {
   std::map<string, string> header_set;
 
   // 82                                      | == Indexed - Add ==
   //                                         |   idx = 2
   //                                         | -> :method: GET
-  // 87                                      | == Indexed - Add ==
-  //                                         |   idx = 7
-  //                                         | -> :scheme: http
   // 86                                      | == Indexed - Add ==
   //                                         |   idx = 6
+  //                                         | -> :scheme: http
+  // 84                                      | == Indexed - Add ==
+  //                                         |   idx = 4
   //                                         | -> :path: /
-  // 44                                      | == Literal indexed ==
-  //                                         |   Indexed name (idx = 4)
+  // 41                                      | == Literal indexed ==
+  //                                         |   Indexed name (idx = 1)
   //                                         |     :authority
   // 8c                                      |   Literal value (len = 15)
   //                                         |     Huffman encoded:
   // f1e3 c2e5 f23a 6ba0 ab90 f4ff           | .....:k.....
   //                                         |     Decoded:
   //                                         | www.example.com
   //                                         | -> :authority: www.example.com
-  string first = a2b_hex("828786448cf1e3c2e5f23a6ba0ab90f4"
+  string first = a2b_hex("828684418cf1e3c2e5f23a6ba0ab90f4"
                          "ff");
   header_set = DecodeBlockExpectingSuccess(first);
 
   EXPECT_THAT(header_set, ElementsAre(
       Pair(":authority", "www.example.com"),
       Pair(":method", "GET"),
       Pair(":path", "/"),
       Pair(":scheme", "http")));
 
-  expectEntry(1, 57, ":authority", "www.example.com");
-  expectEntry(2, 38, ":path", "/");
-  expectEntry(3, 43, ":scheme", "http");
-  expectEntry(4, 42, ":method", "GET");
-  expectStaticEntry(5);
-  EXPECT_EQ(180u, decoder_peer_.header_table()->size());
+  expectEntry(62, 57, ":authority", "www.example.com");
+  EXPECT_EQ(57u, decoder_peer_.header_table()->size());
 
-  // 5c                                      | == Literal indexed ==
-  //                                         |   Indexed name (idx = 28)
+  // 82                                      | == Indexed - Add ==
+  //                                         |   idx = 2
+  //                                         | -> :method: GET
+  // 86                                      | == Indexed - Add ==
+  //                                         |   idx = 6
+  //                                         | -> :scheme: http
+  // 84                                      | == Indexed - Add ==
+  //                                         |   idx = 4
+  //                                         | -> :path: /
+  // be                                      | == Indexed - Add ==
+  //                                         |   idx = 62
+  //                                         | -> :authority: www.example\
+  //                                         |   .com
+  // 58                                      | == Literal indexed ==
+  //                                         |   Indexed name (idx = 24)
   //                                         |     cache-control
   // 86                                      |   Literal value (len = 8)
   //                                         |     Huffman encoded:
   // a8eb 1064 9cbf                          | ...d..
   //                                         |     Decoded:
   //                                         | no-cache
   //                                         | -> cache-control: no-cache
-  string second = a2b_hex("5c86a8eb10649cbf");
+
+  string second = a2b_hex("828684be5886a8eb10649cbf");
   header_set = DecodeBlockExpectingSuccess(second);
 
   EXPECT_THAT(header_set, ElementsAre(
       Pair(":authority", "www.example.com"),
       Pair(":method", "GET"),
       Pair(":path", "/"),
       Pair(":scheme", "http"),
       Pair("cache-control", "no-cache")));
 
-  expectEntry(1, 53, "cache-control", "no-cache");
-  expectEntry(2, 57, ":authority", "www.example.com");
-  expectEntry(3, 38, ":path", "/");
-  expectEntry(4, 43, ":scheme", "http");
-  expectEntry(5, 42, ":method", "GET");
-  expectStaticEntry(6);
-  EXPECT_EQ(233u, decoder_peer_.header_table()->size());
+  expectEntry(62, 53, "cache-control", "no-cache");
+  expectEntry(63, 57, ":authority", "www.example.com");
+  EXPECT_EQ(110u, decoder_peer_.header_table()->size());
 
-  // 30                                      | == Empty reference set ==
-  //                                         |   idx = 0
-  //                                         |   flag = 1
+  // 82                                      | == Indexed - Add ==
+  //                                         |   idx = 2
+  //                                         | -> :method: GET
+  // 87                                      | == Indexed - Add ==
+  //                                         |   idx = 7
+  //                                         | -> :scheme: https
   // 85                                      | == Indexed - Add ==
   //                                         |   idx = 5
-  //                                         | -> :method: GET
-  // 8c                                      | == Indexed - Add ==
-  //                                         |   idx = 12
-  //                                         | -> :scheme: https
-  // 8b                                      | == Indexed - Add ==
-  //                                         |   idx = 11
   //                                         | -> :path: /index.html
-  // 84                                      | == Indexed - Add ==
-  //                                         |   idx = 4
-  //                                         | -> :authority: www.example.com
+  // bf                                      | == Indexed - Add ==
+  //                                         |   idx = 63
+  //                                         | -> :authority: www.example\
+  //                                         |   .com
   // 40                                      | == Literal indexed ==
   // 88                                      |   Literal name (len = 10)
   //                                         |     Huffman encoded:
   // 25a8 49e9 5ba9 7d7f                     | %.I.[.}.
   //                                         |     Decoded:
   //                                         | custom-key
   // 89                                      |   Literal value (len = 12)
   //                                         |     Huffman encoded:
   // 25a8 49e9 5bb8 e8b4 bf                  | %.I.[....
   //                                         |     Decoded:
   //                                         | custom-value
   //                                         | -> custom-key: custom-value
-  string third = a2b_hex("30858c8b84408825a849e95ba97d7f89"
+  string third = a2b_hex("828785bf408825a849e95ba97d7f89"
                          "25a849e95bb8e8b4bf");
   header_set = DecodeBlockExpectingSuccess(third);
 
   EXPECT_THAT(header_set, ElementsAre(
       Pair(":authority", "www.example.com"),
       Pair(":method", "GET"),
       Pair(":path", "/index.html"),
       Pair(":scheme", "https"),
       Pair("custom-key", "custom-value")));
 
-  expectEntry(1, 54, "custom-key", "custom-value");
-  expectEntry(2, 48, ":path", "/index.html");
-  expectEntry(3, 44, ":scheme", "https");
-  expectEntry(4, 53, "cache-control", "no-cache");
-  expectEntry(5, 57, ":authority", "www.example.com");
-  expectEntry(6, 38, ":path", "/");
-  expectEntry(7, 43, ":scheme", "http");
-  expectEntry(8, 42, ":method", "GET");
-  expectStaticEntry(9);
-  EXPECT_EQ(379u, decoder_peer_.header_table()->size());
+  expectEntry(62, 54, "custom-key", "custom-value");
+  expectEntry(63, 53, "cache-control", "no-cache");
+  expectEntry(64, 57, ":authority", "www.example.com");
+  EXPECT_EQ(164u, decoder_peer_.header_table()->size());
 }
 
-TEST_F(HpackDecoderTest, SectionD5ResponseHuffmanExamples) {
+TEST_F(HpackDecoderTest, SectionD6ResponseHuffmanExamples) {
   std::map<string, string> header_set;
   decoder_.ApplyHeaderTableSizeSetting(256);
 
   // 48                                      | == Literal indexed ==
   //                                         |   Indexed name (idx = 8)
   //                                         |     :status
   // 82                                      |   Literal value (len = 3)
   //                                         |     Huffman encoded:
   // 6402                                    | d.
   //                                         |     Decoded:
   //                                         | 302
   //                                         | -> :status: 302
-  // 59                                      | == Literal indexed ==
-  //                                         |   Indexed name (idx = 25)
+  // 58                                      | == Literal indexed ==
+  //                                         |   Indexed name (idx = 24)
   //                                         |     cache-control
   // 85                                      |   Literal value (len = 7)
   //                                         |     Huffman encoded:
   // aec3 771a 4b                            | ..w.K
   //                                         |     Decoded:
   //                                         | private
   //                                         | -> cache-control: private
-  // 63                                      | == Literal indexed ==
-  //                                         |   Indexed name (idx = 35)
+  // 61                                      | == Literal indexed ==
+  //                                         |   Indexed name (idx = 33)
   //                                         |     date
   // 96                                      |   Literal value (len = 29)
   //                                         |     Huffman encoded:
   // d07a be94 1054 d444 a820 0595 040b 8166 | .z...T.D. .....f
   // e082 a62d 1bff                          | ...-..
   //                                         |     Decoded:
   //                                         | Mon, 21 Oct 2013 20:13:21
   //                                         | GMT
   //                                         | -> date: Mon, 21 Oct 2013
   //                                         |   20:13:21 GMT
-  // 71                                      | == Literal indexed ==
-  //                                         |   Indexed name (idx = 49)
+  // 6e                                      | == Literal indexed ==
+  //                                         |   Indexed name (idx = 46)
   //                                         |     location
   // 91                                      |   Literal value (len = 23)
   //                                         |     Huffman encoded:
   // 9d29 ad17 1863 c78f 0b97 c8e9 ae82 ae43 | .)...c.........C
   // d3                                      | .
   //                                         |     Decoded:
   //                                         | https://www.example.com
   //                                         | -> location: https://www.e
   //                                         |    xample.com
-  string first = a2b_hex("488264025985aec3771a4b6396d07abe"
+

[Johnny, 2014/08/06 15:04:50]

nit: examples have inconsistent newlines here.

[Bence, 2014/08/06 20:20:22]

Done.

+  string first = a2b_hex("488264025885aec3771a4b6196d07abe"
                          "941054d444a8200595040b8166e082a6"
-                         "2d1bff71919d29ad171863c78f0b97c8"
+                         "2d1bff6e919d29ad171863c78f0b97c8"
                          "e9ae82ae43d3");
   header_set = DecodeBlockExpectingSuccess(first);
 
   EXPECT_THAT(header_set, ElementsAre(
       Pair(":status", "302"),
       Pair("cache-control", "private"),
       Pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
       Pair("location", "https://www.example.com")));
 
-  expectEntry(1, 63, "location", "https://www.example.com");
-  expectEntry(2, 65, "date", "Mon, 21 Oct 2013 20:13:21 GMT");
-  expectEntry(3, 52, "cache-control", "private");
-  expectEntry(4, 42, ":status", "302");
-  expectStaticEntry(5);
+  expectEntry(62, 63, "location", "https://www.example.com");
+  expectEntry(63, 65, "date", "Mon, 21 Oct 2013 20:13:21 GMT");
+  expectEntry(64, 52, "cache-control", "private");
+  expectEntry(65, 42, ":status", "302");
   EXPECT_EQ(222u, decoder_peer_.header_table()->size());
 
-  // 8c                                      | == Indexed - Add ==
-  //                                         |   idx = 12
+  // 48                                      | == Literal indexed ==
+  //                                         |   Indexed name (idx = 8)
+  //                                         |     :status
+  // 83                                      |   Literal value (len = 3)
+  //                                         |     Huffman encoded:
+  // 640e ff                                 | d..
+  //                                         |     Decoded:
+  //                                         | 307
   //                                         | - evict: :status: 302
-  //                                         | -> :status: 200
-  string second = a2b_hex("8c");
+  //                                         | -> :status: 307
+  // c1                                      | == Indexed - Add ==
+  //                                         |   idx = 65
+  //                                         | -> cache-control: private
+  // c0                                      | == Indexed - Add ==
+  //                                         |   idx = 64
+  //                                         | -> date: Mon, 21 Oct 2013 \
+  //                                         |   20:13:21 GMT
+  // bf                                      | == Indexed - Add ==
+  //                                         |   idx = 63
+  //                                         | -> location: https://www.e\
+  //                                         |   xample.com
+  string second = a2b_hex("4883640effc1c0bf");
   header_set = DecodeBlockExpectingSuccess(second);
 
   EXPECT_THAT(header_set, ElementsAre(
-      Pair(":status", "200"),
+      Pair(":status", "307"),
       Pair("cache-control", "private"),
       Pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
       Pair("location", "https://www.example.com")));
 
-  expectEntry(1, 42, ":status", "200");
-  expectEntry(2, 63, "location", "https://www.example.com");
-  expectEntry(3, 65, "date", "Mon, 21 Oct 2013 20:13:21 GMT");
-  expectEntry(4, 52, "cache-control", "private");
-  expectStaticEntry(5);
+  expectEntry(62, 42, ":status", "307");
+  expectEntry(63, 63, "location", "https://www.example.com");
+  expectEntry(64, 65, "date", "Mon, 21 Oct 2013 20:13:21 GMT");
+  expectEntry(65, 52, "cache-control", "private");
   EXPECT_EQ(222u, decoder_peer_.header_table()->size());
 
-  // 84                                      | == Indexed - Remove ==
-  //                                         |   idx = 4
+  // 88                                      | == Indexed - Add ==
+  //                                         |   idx = 8
+  //                                         | -> :status: 200
+  // c1                                      | == Indexed - Add ==
+  //                                         |   idx = 65
   //                                         | -> cache-control: private
-  // 84                                      | == Indexed - Add ==
-  //                                         |   idx = 4
-  //                                         | -> cache-control: private
-  // 43                                      | == Literal indexed ==
-  //                                         |   Indexed name (idx = 3)
+  // 61                                      | == Literal indexed ==
+  //                                         |   Indexed name (idx = 33)
   //                                         |     date
-  // 96                                      |   Literal value (len = 29)
+  // 96                                      |   Literal value (len = 22)
   //                                         |     Huffman encoded:
   // d07a be94 1054 d444 a820 0595 040b 8166 | .z...T.D. .....f
   // e084 a62d 1bff                          | ...-..
   //                                         |     Decoded:
-  //                                         | Mon, 21 Oct 2013 20:13:22
+  //                                         | Mon, 21 Oct 2013 20:13:22 \
   //                                         | GMT
-  //                                         | - evict: cache-control: pr
+  //                                         | - evict: cache-control: pr\
   //                                         |   ivate
-  //                                         | -> date: Mon, 21 Oct 2013
+  //                                         | -> date: Mon, 21 Oct 2013 \
   //                                         |   20:13:22 GMT
-  // 5e                                      | == Literal indexed ==
-  //                                         |   Indexed name (idx = 30)
+  // c0                                      | == Indexed - Add ==
+  //                                         |   idx = 64
+  //                                         | -> location: https://www.e\
+  //                                         |   xample.com
+  // 5a                                      | == Literal indexed ==
+  //                                         |   Indexed name (idx = 26)
   //                                         |     content-encoding
-  // 83                                      |   Literal value (len = 4)
+  // 83                                      |   Literal value (len = 3)
   //                                         |     Huffman encoded:
   // 9bd9 ab                                 | ...
   //                                         |     Decoded:
   //                                         | gzip
-  //                                         | - evict: date: Mon, 21 Oct
+  //                                         | - evict: date: Mon, 21 Oct\
   //                                         |    2013 20:13:21 GMT
   //                                         | -> content-encoding: gzip
-  // 84                                      | == Indexed - Remove ==
-  //                                         |   idx = 4
-  //                                         | -> location: https://www.e
-  //                                         |   xample.com
-  // 84                                      | == Indexed - Add ==
-  //                                         |   idx = 4
-  //                                         | -> location: https://www.e
-  //                                         |   xample.com
-  // 83                                      | == Indexed - Remove ==
-  //                                         |   idx = 3
-  //                                         | -> :status: 200
-  // 83                                      | == Indexed - Add ==
-  //                                         |   idx = 3
-  //                                         | -> :status: 200
-  // 7b                                      | == Literal indexed ==
-  //                                         |   Indexed name (idx = 59)
+  // 77                                      | == Literal indexed ==
+  //                                         |   Indexed name (idx = 55)
   //                                         |     set-cookie
-  // ad                                      |   Literal value (len = 56)
+  // ad                                      |   Literal value (len = 45)
   //                                         |     Huffman encoded:
   // 94e7 821d d7f2 e6c7 b335 dfdf cd5b 3960 | .........5...[9`
   // d5af 2708 7f36 72c1 ab27 0fb5 291f 9587 | ..'..6r..'..)...
   // 3160 65c0 03ed 4ee5 b106 3d50 07        | 1`e...N...=P.
   //                                         |     Decoded:
-  //                                         | foo=ASDJKHQKBZXOQWEOPIUAXQ
-  //                                         | WEOIU; max-age=3600; versi
+  //                                         | foo=ASDJKHQKBZXOQWEOPIUAXQ\
+  //                                         | WEOIU; max-age=3600; versi\
   //                                         | on=1
-  //                                         | - evict: location: https:/
+  //                                         | - evict: location: https:/\
   //                                         |   /www.example.com
-  //                                         | - evict: :status: 200
-  //                                         | -> set-cookie: foo=ASDJKHQ
-  //                                         |   KBZXOQWEOPIUAXQWEOIU; ma
+  //                                         | - evict: :status: 307
+  //                                         | -> set-cookie: foo=ASDJKHQ\
+  //                                         |   KBZXOQWEOPIUAXQWEOIU; ma\
   //                                         |   x-age=3600; version=1
-  string third = a2b_hex("84844396d07abe941054d444a8200595"
-                         "040b8166e084a62d1bff5e839bd9ab84"
-                         "8483837bad94e7821dd7f2e6c7b335df"
-                         "dfcd5b3960d5af27087f3672c1ab270f"
-                         "b5291f9587316065c003ed4ee5b1063d"
-                         "5007");
+  string third = a2b_hex("88c16196d07abe941054d444a8200595"
+                         "040b8166e084a62d1bffc05a839bd9ab"
+                         "77ad94e7821dd7f2e6c7b335dfdfcd5b"
+                         "3960d5af27087f3672c1ab270fb5291f"
+                         "9587316065c003ed4ee5b1063d5007");
   header_set = DecodeBlockExpectingSuccess(third);
 
   EXPECT_THAT(header_set, ElementsAre(
       Pair(":status", "200"),
       Pair("cache-control", "private"),
       Pair("content-encoding", "gzip"),
       Pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
       Pair("location", "https://www.example.com"),
       Pair("set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU;"
            " max-age=3600; version=1")));
 
-  expectEntry(1, 98, "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU;"
+  expectEntry(62, 98, "set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU;"
               " max-age=3600; version=1");
-  expectEntry(2, 52, "content-encoding", "gzip");
-  expectEntry(3, 65, "date", "Mon, 21 Oct 2013 20:13:22 GMT");
-  expectStaticEntry(4);
+  expectEntry(63, 52, "content-encoding", "gzip");
+  expectEntry(64, 65, "date", "Mon, 21 Oct 2013 20:13:22 GMT");
   EXPECT_EQ(215u, decoder_peer_.header_table()->size());
 }
 
 }  // namespace
 
 }  // namespace net