Merge branch 'master' of github.com:http2/compression-test

httpwg · Feb 25, 2013 · 8efc505 · 8efc505
2 parents 2edc466 + 332a919
commit 8efc505
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/compressor/headerdiff/__init__.py b/compressor/headerdiff/__init__.py
@@ -115,8 +115,17 @@ def compress(self, in_headers, host):
  return frame
 
  def decompress(self, compressed):
- hdrs = self.codec.decodeHeaders(compressed, self.is_request)
- hdrs = dict(hdrs)
+ headers = self.codec.decodeHeaders(compressed, self.is_request)
+ hdrs = {}
+ for k, v in headers:
+ if k in hdrs:
+ if k == "cookie":
+ pass
+ hdrs[k] += ";" + v
+ else:
+ hdrs[k] += "\0" + v
+ else:
+ hdrs[k] = v
 
  # Split "url".
  if self.is_request: