net: separate SPDY cookies with "; " as the new RFC requires.

third_party/zlib/mixed-source.patch

 diff --git a/third_party/zlib/deflate.c b/third_party/zlib/deflate.c
-index 5c4022f..02d1516 100644
+index 5c4022f..88b2ec0 100644
 --- a/third_party/zlib/deflate.c
 +++ b/third_party/zlib/deflate.c
 @@ -70,14 +70,15 @@ typedef enum {
      finish_done     /* finish done, accept no more input or output */
  } block_state;
  
 -typedef block_state (*compress_func) OF((deflate_state *s, int flush));
 +typedef block_state (*compress_func) OF((deflate_state *s, int flush,
 +                                         int clas));
  /* Compression function. Returns the block state after the call. */
@@ skipping 193 matching lines @@
 +        } else {
 +            /* We have to be mindful of the class of the data and not stray. */
 +            do {
 +            } while (*++scan == *++match &&
 +                     class_at(s, match - s->window) == clas &&
 +                     scan < strend);
 +        }
  
          Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
  
-@@ -1204,20 +1293,67 @@ local uInt longest_match(s, cur_match)
+@@ -1204,20 +1293,74 @@ local uInt longest_match(s, cur_match)
  }
  #endif /* ASMV */
  
 +/* cookie_match is a replacement for longest_match in the case of cookie data.
 + * Here we only wish to match the entire value so trying the partial matches in
 + * longest_match is both wasteful and often fails to find the correct match.
 + *
 + * So we take the djb2 hash of the cookie and look up the last position for a
 + * match in a special hash table. */
 +local uInt cookie_match(s, start, len)
 +    deflate_state *s;
 +    IPos start;
 +    unsigned len;
 +{
 +    unsigned hash = 5381;
 +    Bytef *str = s->window + start;
 +    unsigned i;
 +    IPos cookie_location;
 +
-+    if (len >= MAX_MATCH)
++    if (len >= MAX_MATCH || len == 0)
 +        return 0;
 +
 +    for (i = 0; i < len; i++)
 +        hash = ((hash << 5) + hash) + str[i];
 +
 +    hash &= Z_COOKIE_HASH_MASK;
 +    cookie_location = s->cookie_locations[hash];
 +    s->cookie_locations[hash] = start;
 +    s->match_start = 0;
 +    if (cookie_location &&
 +        (start - cookie_location) > len &&
 +        (start - cookie_location) < MAX_DIST(s) &&
 +        len <= s->lookahead) {
 +        for (i = 0; i < len; i++) {
 +            if (s->window[start+i] != s->window[cookie_location+i] ||
 +                class_at(s, cookie_location+i) != 1) {
 +                return 0;
 +            }
 +        }
++        /* Check that we aren't matching a prefix of another cookie by ensuring
++         * that the final byte is either a semicolon (which cannot appear in a
++         * cookie value), or non-cookie data. */
++        if (s->window[cookie_location+len-1] != ';' &&
++            class_at(s, cookie_location+len) != 0) {
++          return 0;
++        }
 +        s->match_start = cookie_location;
 +        return len;
 +    }
 +
 +    return 0;
 +}
 +
 +
  #else /* FASTEST */
  
  /* ---------------------------------------------------------------------------
   * Optimized version for FASTEST only
   */
 -local uInt longest_match(s, cur_match)
 +local uInt longest_match(s, cur_match, clas)
      deflate_state *s;
      IPos cur_match;                             /* current match */
 +    int clas;
  {
      register Bytef *scan = s->window + s->strstart; /* current string */
      register Bytef *match;                       /* matched string */
      register int len;                           /* length of current match */
      register Bytef *strend = s->window + s->strstart + MAX_MATCH;
  
 +#error "This code not patched"
 +
      /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
       * It is easy to get rid of this optimization if necessary.
       */
-@@ -1360,6 +1496,21 @@ local void fill_window(s)
+@@ -1360,6 +1503,21 @@ local void fill_window(s)
                   */
              } while (--n);
  #endif
 +
 +            for (n = 0; n < Z_COOKIE_HASH_SIZE; n++) {
 +                if (s->cookie_locations[n] > wsize) {
 +                    s->cookie_locations[n] -= wsize;
 +                } else {
 +                    s->cookie_locations[n] = 0;
 +                }
 +            }
 +
 +            if (s->class_bitmap) {
 +                zmemcpy(s->class_bitmap, s->class_bitmap + s->w_size/8,
 +                        s->w_size/8);
 +                zmemzero(s->class_bitmap + s->w_size/8, s->w_size/8);
 +            }
 +
              more += wsize;
          }
          if (s->strm->avail_in == 0) return;
-@@ -1378,6 +1529,9 @@ local void fill_window(s)
+@@ -1378,6 +1536,9 @@ local void fill_window(s)
          Assert(more >= 2, "more < 2");
  
          n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
 +        if (s->class_bitmap != NULL) {
 +            class_set(s, s->strstart + s->lookahead, n, s->strm->clas);
 +        }
          s->lookahead += n;
  
          /* Initialize the hash value now that we have some input: */
-@@ -1459,9 +1613,10 @@ local void fill_window(s)
+@@ -1459,9 +1620,10 @@ local void fill_window(s)
   * NOTE: this function should be optimized to avoid extra copying from
   * window to pending_buf.
   */
 -local block_state deflate_stored(s, flush)
 +local block_state deflate_stored(s, flush, clas)
      deflate_state *s;
      int flush;
 +    int clas;
  {
      /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
       * to pending_buf_size, and each stored block has a 5 byte header:
-@@ -1517,13 +1672,19 @@ local block_state deflate_stored(s, flush)
+@@ -1517,13 +1679,19 @@ local block_state deflate_stored(s, flush)
   * new strings in the dictionary only for unmatched strings or for short
   * matches. It is used only for the fast compression options.
   */
 -local block_state deflate_fast(s, flush)
 +local block_state deflate_fast(s, flush, clas)
      deflate_state *s;
      int flush;
 +    int clas;
  {
      IPos hash_head;       /* head of the hash chain */
      int bflush;           /* set if current block must be flushed */
  
 +    if (clas != 0) {
 +        /* We haven't patched this code for alternative class data. */
 +        return Z_BUF_ERROR;
 +    }
 +
      for (;;) {
          /* Make sure that we always have enough lookahead, except
           * at the end of the input file. We need MAX_MATCH bytes
-@@ -1554,7 +1715,7 @@ local block_state deflate_fast(s, flush)
+@@ -1554,7 +1722,7 @@ local block_state deflate_fast(s, flush)
               * of window index 0 (in particular we have to avoid a match
               * of the string with itself at the start of the input file).
               */
 -            s->match_length = longest_match (s, hash_head);
 +            s->match_length = longest_match (s, hash_head, clas);
              /* longest_match() sets match_start */
          }
          if (s->match_length >= MIN_MATCH) {
-@@ -1613,12 +1774,25 @@ local block_state deflate_fast(s, flush)
+@@ -1613,12 +1781,25 @@ local block_state deflate_fast(s, flush)
   * evaluation for matches: a match is finally adopted only if there is
   * no better match at the next window position.
   */
 -local block_state deflate_slow(s, flush)
 +local block_state deflate_slow(s, flush, clas)
      deflate_state *s;
      int flush;
 +    int clas;
  {
      IPos hash_head;          /* head of hash chain */
      int bflush;              /* set if current block must be flushed */
 +    uInt input_length ;
 +    int first = 1;           /* first says whether this is the first iteration
 +                                of the loop, below. */
 +
 +    if (clas == Z_CLASS_COOKIE) {
 +        if (s->lookahead) {
 +            /* Alternative class data must always be presented at the beginning
 +             * of a block. */
 +            return Z_BUF_ERROR;
 +        }
 +        input_length = s->strm->avail_in;
 +    }
  
      /* Process the input block. */
      for (;;) {
-@@ -1648,13 +1822,18 @@ local block_state deflate_slow(s, flush)
+@@ -1648,13 +1829,18 @@ local block_state deflate_slow(s, flush)
          s->prev_length = s->match_length, s->prev_match = s->match_start;
          s->match_length = MIN_MATCH-1;
  
 -        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
 -            s->strstart - hash_head <= MAX_DIST(s)) {
 +        if (clas == Z_CLASS_COOKIE && first) {
 +            s->match_length = cookie_match(s, s->strstart, input_length);
 +        } else if (clas == Z_CLASS_STANDARD &&
 +                   hash_head != NIL &&
 +                   s->prev_length < s->max_lazy_match &&
 +                   s->strstart - hash_head <= MAX_DIST(s)) {
              /* To simplify the code, we prevent matches with the string
               * of window index 0 (in particular we have to avoid a match
               * of the string with itself at the start of the input file).
               */
 -            s->match_length = longest_match (s, hash_head);
 +            s->match_length = longest_match (s, hash_head, clas);
 +
              /* longest_match() sets match_start */
  
              if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-@@ -1673,7 +1852,22 @@ local block_state deflate_slow(s, flush)
+@@ -1673,7 +1859,20 @@ local block_state deflate_slow(s, flush)
          /* If there was a match at the previous step and the current
           * match is not better, output the previous match:
           */
 -        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
 +        first = 0;
 +        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length &&
 +            /* We will only accept an exact match for Z_CLASS_COOKIE data and
 +             * we won't match Z_CLASS_HUFFMAN_ONLY data at all. */
 +            (clas == Z_CLASS_STANDARD || (clas == Z_CLASS_COOKIE &&
 +                            s->prev_length == input_length &&
 +                            s->prev_match > 0 &&
 +                            /* We require that a Z_CLASS_COOKIE match be
 +                             * preceded by either a semicolon (which cannot be
 +                             * part of a cookie), or non-cookie data. This is
-+                             * to prevent
-+                             * a cookie from being a prefix of another.
-+                             * spdy_framer.cc ensures that cookies are always
-+                             * terminated by a semicolon. */
++                             * to prevent a cookie from being a suffix of
++                             * another. */
 +                            (class_at(s, s->prev_match-1) == Z_CLASS_STANDARD ||
 +                             *(s->window + s->prev_match-1) == ';')))) {
              uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
              /* Do not insert strings in hash table beyond this. */
  
 diff --git a/third_party/zlib/deflate.h b/third_party/zlib/deflate.h
-index cbf0d1e..83b4602 100644
+index cbf0d1e..2fe6fd6 100644
 --- a/third_party/zlib/deflate.h
 +++ b/third_party/zlib/deflate.h
 @@ -91,6 +91,9 @@ typedef unsigned IPos;
   * save space in the various tables. IPos is used only for parameter passing.
   */
  
-+#define Z_COOKIE_HASH_SIZE 64
++#define Z_COOKIE_HASH_SIZE 256
 +#define Z_COOKIE_HASH_MASK (Z_COOKIE_HASH_SIZE-1)
 +
  typedef struct internal_state {
      z_streamp strm;      /* pointer back to this zlib stream */
      int   status;        /* as the name implies */
 @@ -139,6 +142,8 @@ typedef struct internal_state {
      uInt  hash_mask;      /* hash_size-1 */
  
      uInt  hash_shift;
 +    Bytef *class_bitmap;  /* bitmap of class for each byte in window */
@@ skipping 31 matching lines @@
 +#  else
 +     ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
 +     ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
 +     ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
 +     ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
 +     ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
 +     ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
  #  endif
  #else
     ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));