Merge remote-tracking branch 'upstream/development' into development

Author: mylh

.travis.yml

@@ -31,7 +31,7 @@ script:
         if [[ $TRAVIS_PYTHON_VERSION == pypy ]]; then
           py.test test/
         else
-          py.test -n 4 --cov hyper test/
+          py.test -n 1 --cov hyper test/
           coverage report -m --fail-under 100
         fi
       fi

HISTORY.rst

@@ -1,6 +1,14 @@
 Release History
 ===============
 
+dev
+---
+
+*Bugfixes*
+
+- Overriding HTTP/2 special headers no longer leads to ill-formed header blocks
+  with special headers at the end.
+
 0.5.0 (2015-10-11)
 ------------------
 

hyper/cli.py

@@ -164,7 +164,14 @@ def set_request_data(args):
     body, headers, params = {}, {}, {}
     for i in args.items:
         if i.sep == SEP_HEADERS:
-            headers[i.key] = i.value
+            if i.key:
+                headers[i.key] = i.value
+            else:
+                # when overriding a HTTP/2 special header there will be a leading 
+                # colon, which tricks the command line parser into thinking 
+                # the header is empty
+                k, v = i.value.split(':', 1)
+                headers[':' + k] = v
         elif i.sep == SEP_QUERY:
             params[i.key] = i.value
         elif i.sep == SEP_DATA:

hyper/common/connection.py

@@ -25,7 +25,7 @@ class HTTPConnection(object):
         hostname, and optionally may include a port: for example,
         ``'http2bin.org'``, ``'http2bin.org:443'`` or ``'127.0.0.1'``.
     :param port: (optional) The port to connect to. If not provided and one also
-        isn't provided in the ``host`` parameter, defaults to 443.
+        isn't provided in the ``host`` parameter, defaults to 80.
     :param secure: (optional) Whether the request should use TLS.
         Defaults to ``False`` for most requests, but to ``True`` for any
         request issued to port 443.
@@ -42,7 +42,7 @@ class HTTPConnection(object):
         If not provided then hyper's default ``SSLContext`` is used instead.
     :param proxy_host: (optional) The proxy to connect to.  This can be an IP address
         or a host name and may include a port.
-    :param proxy_port: (optional) The proxy port to connect to. If not provided 
+    :param proxy_port: (optional) The proxy port to connect to. If not provided
         and one also isn't provided in the ``proxy`` parameter, defaults to 8080.
     """
     def __init__(self,
@@ -59,12 +59,12 @@ def __init__(self,
         self._host = host
         self._port = port
         self._h1_kwargs = {
-            'secure': secure, 'ssl_context': ssl_context, 
-            'proxy_host': proxy_host, 'proxy_port': proxy_port 
+            'secure': secure, 'ssl_context': ssl_context,
+            'proxy_host': proxy_host, 'proxy_port': proxy_port
         }
         self._h2_kwargs = {
             'window_manager': window_manager, 'enable_push': enable_push,
-            'secure': secure, 'ssl_context': ssl_context, 
+            'secure': secure, 'ssl_context': ssl_context,
             'proxy_host': proxy_host, 'proxy_port': proxy_port
         }
 

hyper/common/headers.py

@@ -184,15 +184,28 @@ def iter_raw(self):
     def replace(self, key, value):
         """
         Replace existing header with new value. If header doesn't exist this
-        method work like ``__setitem__``. Replacing leads to deletion of all 
-        exsiting headers with the same name.
+        method work like ``__setitem__``. Replacing leads to deletion of all
+        existing headers with the same name.
         """
-        try:
-            del self[key]
-        except KeyError:
-            pass
+        key = to_bytestring(key)
+        indices = []
+        for (i, (k, v)) in enumerate(self._items):
+            if _keys_equal(k, key):
+                indices.append(i)
+
+        # If the key isn't present, this is easy: just append and abort early.
+        if not indices:
+            self._items.append((key, value))
+            return
+
+        # Delete all but the first. I swear, this is the correct slicing
+        # syntax!
+        base_index = indices[0]
+        for i in indices[:0:-1]:
+            self._items.pop(i)
 
-        self[key] = value
+        del self._items[base_index]
+        self._items.insert(base_index, (key, value))
 
     def merge(self, other):
         """

hyper/http20/connection.py

@@ -9,7 +9,7 @@
 from ..common.exceptions import ConnectionResetError
 from ..common.bufsocket import BufferedSocket
 from ..common.headers import HTTPHeaderMap
-from ..common.util import to_host_port_tuple, to_native_string
+from ..common.util import to_host_port_tuple, to_native_string, to_bytestring
 from ..packages.hyperframe.frame import (
     FRAMES, DataFrame, HeadersFrame, PushPromiseFrame, RstStreamFrame,
     SettingsFrame, Frame, WindowUpdateFrame, GoAwayFrame, PingFrame,
@@ -179,8 +179,8 @@ def request(self, method, url, body=None, headers={}):
             self.putheader(name, value, stream_id, replace=is_default)
 
         # Convert the body to bytes if needed.
-        if isinstance(body, str):
-            body = body.encode('utf-8')
+        if body:
+            body = to_bytestring(body)
 
         self.endheaders(message_body=body, final=True, stream_id=stream_id)
 

test/test_cli.py

@@ -110,11 +110,20 @@ def test_cli_with_system_exit(argv):
      {'method': 'GET', 'url.path': '/?param=test'}),
     (['POST', 'example.com', 'data=test'],
      {'method': 'POST', 'body': '{"data": "test"}'}),
+    (['GET', 'example.com', ':authority:example.org'],
+     {'method': 'GET', 'headers': {
+                            ':authority': 'example.org'}}),
+    (['GET', 'example.com', ':authority:example.org', 'x-test:header'],
+     {'method': 'GET', 'headers': {
+                            ':authority': 'example.org',
+                            'x-test':'header'}}),
 ], ids=[
     'specified "--debug" option',
     'specified host and additional header',
     'specified host and get parameter',
     'specified host and post data',
+    'specified host and override default header',
+    'specified host and override default header and additional header',
 ])
 def test_parse_argument(argv, expected):
     args = parse_argument(argv)

test/test_headers.py

@@ -272,8 +272,8 @@ def test_replacing(self):
 
         assert list(h.items()) == [
             (b'name', b'value'),
-            (b'name3', b'value3'),
             (b'name2', b'42'),
+            (b'name3', b'value3'),
             (b'name4', b'other_value'),
         ]
 

test/test_hyper.py

@@ -122,8 +122,8 @@ def test_putheader_replaces_headers(self):
         assert list(s.headers.items()) == [
             (b':method', b'GET'),
             (b':scheme', b'https'),
-            (b':path', b'/'),
             (b':authority', b'www.example.org'),
+            (b':path', b'/'),
             (b'name', b'value2'),
         ]
 
@@ -221,6 +221,22 @@ def test_putrequest_sends_data(self):
         assert len(sock.queue) == 2
         assert c._out_flow_control_window == 65535 - len(b'hello')
 
+    def test_request_with_utf8_bytes_body(self):
+        c = HTTP20Connection('www.google.com')
+        c._sock = DummySocket()
+        body = '你好' if is_py2 else '你好'.encode('utf-8')
+        c.request('GET', '/', body=body)
+
+        assert c._out_flow_control_window == 65535 - len(body)
+
+    def test_request_with_unicode_body(self):
+        c = HTTP20Connection('www.google.com')
+        c._sock = DummySocket()
+        body = '你好'.decode('unicode-escape') if is_py2 else '你好'
+        c.request('GET', '/', body=body)
+
+        assert c._out_flow_control_window == 65535 - len(body.encode('utf-8'))
+
     def test_different_request_headers(self):
         sock = DummySocket()
 
@@ -581,7 +597,7 @@ def test_recv_cb_n_times(self):
 
         def consume_single_frame():
             mutable['counter'] += 1
-            
+
         c._consume_single_frame = consume_single_frame
         c._recv_cb()
 
@@ -779,7 +795,7 @@ def test_streams_can_replace_none_headers(self):
             (b"name", b"value"),
             (b"other_name", b"other_value")
         ]
-        
+
     def test_stream_opening_sends_headers(self):
         def data_callback(frame):
             assert isinstance(frame, HeadersFrame)
@@ -1548,7 +1564,7 @@ def test_connection_error_when_send_out_of_range_frame(self):
 class NullEncoder(object):
     @staticmethod
     def encode(headers):
-        
+
         def to_str(v):
             if is_py2:
                 return str(v)
@@ -1557,7 +1573,7 @@ def to_str(v):
                     v = str(v, 'utf-8')
                 return v
 
-        return '\n'.join("%s%s" % (to_str(name), to_str(val)) 
+        return '\n'.join("%s%s" % (to_str(name), to_str(val))
                          for name, val in headers)