From 4fa9814e3018a3c8797f79485f0132b4d9b8b690 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@squareup.com>
Date: Mon, 20 Jan 2014 12:52:48 -0800
Subject: [PATCH] Clarify action taken when hpack reader applies new header
 table size.

---
 .../okhttp/internal/spdy/HpackDraft05.java    | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java b/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java
index 4139d3f1e..75c77240a 100644
--- a/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java
+++ b/okhttp-protocols/src/main/java/com/squareup/okhttp/internal/spdy/HpackDraft05.java
@@ -92,7 +92,6 @@ final class HpackDraft05 {
   private HpackDraft05() {
   }
 
-  // TODO: huffman encoding!
   // http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-05#section-4.1.2
   static class Reader {
     private final Huffman.Codec huffmanCodec;
@@ -132,12 +131,28 @@ final class HpackDraft05 {
       return maxHeaderTableByteCount;
     }
 
-    /** Evicts entries as needed. */
+    /**
+     * Called by the reader when the peer sent a new header table size setting.
+     *
+     * Evicts entries or clears the table as needed.
+     */
     void maxHeaderTableByteCount(int newMaxHeaderTableByteCount) {
-      if (newMaxHeaderTableByteCount < headerTableByteCount) {
-        evictToRecoverBytes(headerTableByteCount - newMaxHeaderTableByteCount);
-      }
       this.maxHeaderTableByteCount = newMaxHeaderTableByteCount;
+      if (maxHeaderTableByteCount < headerTableByteCount) {
+        if (maxHeaderTableByteCount == 0) {
+          clearHeaderTable();
+        } else {
+          evictToRecoverBytes(headerTableByteCount - maxHeaderTableByteCount);
+        }
+      }
+    }
+
+    private void clearHeaderTable() {
+      clearReferenceSet();
+      Arrays.fill(headerTable, null);
+      nextHeaderIndex = headerTable.length - 1;
+      headerCount = 0;
+      headerTableByteCount = 0;
     }
 
     /** Returns the count of entries evicted. */
@@ -286,11 +301,7 @@ final class HpackDraft05 {
 
       // if the new or replacement header is too big, drop all entries.
       if (delta > maxHeaderTableByteCount) {
-        clearReferenceSet();
-        Arrays.fill(headerTable, null);
-        nextHeaderIndex = headerTable.length - 1;
-        headerCount = 0;
-        headerTableByteCount = 0;
+        clearHeaderTable();
         // emit the large header to the callback.
         emittedHeaders.add(entry);
         return;