Added support for plaintext http20

Author: fredthomsen

hyper/common/connection.py

@@ -27,8 +27,8 @@ class HTTPConnection(object):
         ``'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.
-    :param secure: (optional, HTTP/1.1 only) Whether the request should use
-        TLS. Defaults to ``False`` for most requests, but to ``True`` for any
+    :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.
     :param window_manager: (optional) The class to use to manage flow control
         windows. This needs to be a subclass of the

hyper/http20/connection.py

@@ -27,6 +27,7 @@
 
 log = logging.getLogger(__name__)
 
+H2_CLEARTEXT_PROTOCOL = 'h2c'
 
 class HTTP20Connection(object):
     """
@@ -43,6 +44,9 @@ class HTTP20Connection(object):
         ``'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.
+    :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.
     :param window_manager: (optional) The class to use to manage flow control
         windows. This needs to be a subclass of the
         :class:`BaseFlowControlManager <hyper.http20.window.BaseFlowControlManager>`.
@@ -55,7 +59,7 @@ class HTTP20Connection(object):
     :param ssl_context: (optional) A class with custom certificate settings.
         If not provided then hyper's default ``SSLContext`` is used instead.
     """
-    def __init__(self, host, port=None, window_manager=None, enable_push=False,
+    def __init__(self, host, port=None, secure=None, window_manager=None, enable_push=False,
                  ssl_context=None, **kwargs):
         """
         Creates an HTTP/2 connection to a specific server.
@@ -69,6 +73,13 @@ def __init__(self, host, port=None, window_manager=None, enable_push=False,
         else:
             self.host, self.port = host, port
 
+        if secure is not None:
+            self.secure = secure
+        elif self.port == 443:
+            self.secure = True
+        else:
+            self.secure = False
+
         self._enable_push = enable_push
         self.ssl_context = ssl_context
 
@@ -210,9 +221,13 @@ def connect(self):
         if self._sock is None:
             sock = socket.create_connection((self.host, self.port), 5)
 
-            sock, proto = wrap_socket(sock, self.host, self.ssl_context)
+            if self.secure:
+                sock, proto = wrap_socket(sock, self.host, self.ssl_context)
+            else:
+                proto = H2_CLEARTEXT_PROTOCOL
+
             log.debug("Selected NPN protocol: %s", proto)
-            assert proto in H2_NPN_PROTOCOLS
+            assert proto in (H2_NPN_PROTOCOLS, H2_CLEARTEXT_PROTOCOL)
 
             self._sock = BufferedSocket(sock, self.network_buffer_size)