Merge branch 'development' into http11

Author: Lukasa

HISTORY.rst

@@ -1,8 +1,8 @@
 Release History
 ===============
 
-Upcoming
---------
+0.2.2 (2015-04-03)
+------------------
 
 *Bugfixes*
 

docs/source/conf.py

@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.1'
+version = '0.2.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.1'
+release = '0.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

hyper/__init__.py

@@ -6,7 +6,7 @@
 A module for providing an abstraction layer over the differences between
 HTTP/1.1 and HTTP/2.
 """
-__version__ = '0.2.1'
+__version__ = '0.2.2'
 
 from .http20.connection import HTTP20Connection
 from .http20.response import HTTP20Response, HTTP20Push

hyper/http20/hpack.py

@@ -25,7 +25,7 @@ def encode_integer(integer, prefix_bits):
     This encodes an integer according to the wacky integer encoding rules
     defined in the HPACK spec.
     """
-    log.debug("Encoding %d with %d bits.", integer, prefix_bits)
+    log.debug("Encoding %d with %d bits", integer, prefix_bits)
 
     max_number = (2 ** prefix_bits) - 1
 
@@ -70,7 +70,7 @@ def decode_integer(data, prefix_bits):
                 number += next_byte * multiple(index)
                 break
 
-    log.debug("Decoded %d consuming %d bytes.", number, index + 1)
+    log.debug("Decoded %d, consumed %d bytes", number, index + 1)
 
     return (number, index + 1)
 
@@ -650,9 +650,9 @@ def _decode_literal(self, data, should_index):
             self._add_to_header_table(header)
 
         log.debug(
-            "Decoded %s, consumed %d, indexed %s",
+            "Decoded %s, total consumed %d bytes, indexed %s",
             header,
-            consumed,
+            total_consumed,
             should_index
         )