Merge branch 'proto_override' of https://github.com/markjenkins/hyper into markjenkins-proto_override

Author: Lukasa

hyper/http20/connection.py

@@ -65,7 +65,8 @@ class HTTP20Connection(object):
         and one also isn't provided in the ``proxy`` parameter, defaults to 8080.
     """
     def __init__(self, host, port=None, secure=None, window_manager=None, enable_push=False,
-                 ssl_context=None, proxy_host=None, proxy_port=None, **kwargs):
+                 ssl_context=None, proxy_host=None, proxy_port=None,
+                 force_proto=None, **kwargs):
         """
         Creates an HTTP/2 connection to a specific server.
         """
@@ -100,6 +101,8 @@ def __init__(self, host, port=None, secure=None, window_manager=None, enable_pus
         #: Defaults to 64kB.
         self.network_buffer_size = 65536
 
+        self.force_proto = force_proto
+
         # Create the mutable state.
         self.__wm_class = window_manager or FlowControlManager
         self.__init_state()
@@ -235,7 +238,8 @@ def connect(self):
 
             if self.secure:
                 assert not self.proxy_host, "Using a proxy with HTTPS not yet supported."
-                sock, proto = wrap_socket(sock, host, self.ssl_context)
+                sock, proto = wrap_socket(sock, host, self.ssl_context,
+                                          force_proto=self.force_proto)
             else:
                 proto = H2C_PROTOCOL
 

hyper/tls.py

@@ -24,7 +24,7 @@
 cert_loc = path.join(path.dirname(__file__), 'certs.pem')
 
 
-def wrap_socket(sock, server_hostname, ssl_context=None):
+def wrap_socket(sock, server_hostname, ssl_context=None, force_proto=None):
     """
     A vastly simplified SSL wrapping function. We'll probably extend this to
     do more things later.
@@ -49,16 +49,19 @@ def wrap_socket(sock, server_hostname, ssl_context=None):
         except AttributeError:
             ssl.verify_hostname(ssl_sock, server_hostname)  # pyopenssl
 
-    proto = None
+    if force_proto != None:
+        proto = force_proto
+    else:
+        proto = None
 
-    # ALPN is newer, so we prefer it over NPN. The odds of us getting different
-    # answers is pretty low, but let's be sure.
-    with ignore_missing():
-        proto = ssl_sock.selected_alpn_protocol()
+        # ALPN is newer, so we prefer it over NPN. The odds of us getting
+        # different answers is pretty low, but let's be sure.
+        with ignore_missing():
+            proto = ssl_sock.selected_alpn_protocol()
 
-    with ignore_missing():
-        if proto is None:
-            proto = ssl_sock.selected_npn_protocol()
+        with ignore_missing():
+            if proto is None:
+                proto = ssl_sock.selected_npn_protocol()
 
     return (ssl_sock, proto)