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

third_party/zlib/deflate.c

 /* deflate.c -- compress data using the deflation algorithm
  * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
 /*
  *  ALGORITHM
  *
  *      The "deflation" process depends on being able to identify portions
  *      of the input text which are identical to earlier input (within a
@@ skipping 1291 matching lines @@
 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 the match is followed by 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 */
 
@@ skipping 513 matching lines @@
         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. */
 
             check_match(s, s->strstart-1, s->prev_match, s->prev_length);
 
             _tr_tally_dist(s, s->strstart -1 - s->prev_match,
                            s->prev_length - MIN_MATCH, bflush);
 
@@ skipping 140 matching lines @@
         s->match_length = 0;
         Tracevv((stderr,"%c", s->window[s->strstart]));
         _tr_tally_lit (s, s->window[s->strstart], bflush);
         s->lookahead--;
         s->strstart++;
         if (bflush) FLUSH_BLOCK(s, 0);
     }
     FLUSH_BLOCK(s, flush == Z_FINISH);
     return flush == Z_FINISH ? finish_done : block_done;
 }