Move to H1 NPN whitelist.

Author: Lukasa

hyper/http11/connection.py

@@ -10,7 +10,7 @@
 import socket
 
 from .response import HTTP11Response
-from ..tls import wrap_socket, H2_NPN_PROTOCOLS
+from ..tls import wrap_socket
 from ..http20.bufsocket import BufferedSocket
 from ..common.headers import HTTPHeaderMap
 from ..common.util import to_bytestring
@@ -87,7 +87,7 @@ def connect(self):
 
             if self.secure:
                 sock, proto = wrap_socket(sock, self.host)
-                assert proto not in H2_NPN_PROTOCOLS
+                assert proto in ('http/1.1', None)
 
             self._sock = BufferedSocket(sock, self.network_buffer_size)
 

hyper/tls.py

@@ -40,7 +40,7 @@ def wrap_socket(sock, server_hostname):
     if _context.check_hostname:  # pragma: no cover
         ssl.match_hostname(ssl_sock.getpeercert(), server_hostname)
 
-    proto = ''
+    proto = None
     with ignore_missing():
         proto = ssl_sock.selected_npn_protocol()
 

test/test_integration_http11.py

@@ -10,15 +10,13 @@
 import threading
 
 from hyper.compat import ssl
-from hyper.http11.connection import HTTP11Connection
 from server import SocketLevelTest
 
 # Turn off certificate verification for the tests.
 if ssl is not None:
     hyper.tls._context = hyper.tls._init_context()
     hyper.tls._context.check_hostname = False
     hyper.tls._context.verify_mode = ssl.CERT_NONE
-    hyper.http11.connection.H2_NPN_PROTOCOLS += ['']
 
 
 class TestHyperH11Integration(SocketLevelTest):