Cleaned up http11 upgrade to plaintext http20

Author: fredthomsen

hyper/common/connection.py

@@ -114,22 +114,23 @@ def get_response(self):
             return self._conn.get_response()
         except HTTPUpgrade as e:
             # We upgraded via the HTTP Upgrade mechanism. We can just 
-            #go straight to the world of HTTP/2. Replace the backing object 
-            #and insert the socket into it.
+            # go straight to the world of HTTP/2. Replace the backing object 
+            # and insert the socket into it.
             assert e.negotiated == H2C_PROTOCOL
 
             self._conn = HTTP20Connection(
                 self._host, self._port, **self._h2_kwargs
             )
 
-            #stream id 1 is used by the upgrade request and response
-            self.next_stream_id += 2
             self._conn._sock = e.sock
-            
+            # stream id 1 is used by the upgrade request and response
+            # and is half-closed by the client
+            self._conn._new_stream(stream_id=1, local_closed=True)
+
             # HTTP/2 preamble must be sent after receipt of a HTTP/1.1 101
             self._conn._send_preamble()
-
-            return e.resp
+        
+            return self._conn.get_response(1)
 
     # Can anyone say 'proxy object pattern'?
     def __getattr__(self, name):

hyper/common/exceptions.py

@@ -56,8 +56,7 @@ class HTTPUpgrade(Exception):
     """
     We upgraded to a new protocol via the HTTP Upgrade response.
     """
-    def __init__(self, negotiated, sock, resp):
+    def __init__(self, negotiated, sock):
         super(HTTPUpgrade, self).__init__()
         self.negotiated = negotiated
         self.sock = sock
-        self.resp = resp

hyper/http11/connection.py

@@ -19,7 +19,6 @@
 from ..compat import bytes
 
 from ..http20.connection import H2C_PROTOCOL
-from ..http20.response import HTTP20Response
 from ..packages.hyperframe.frame import SettingsFrame
 
 # We prefer pycohttpparser to the pure-Python interpretation
@@ -181,9 +180,7 @@ def get_response(self):
 
         if(response.status == 101 and 
            b'upgrade' in headers['connection'] and bytes(H2C_PROTOCOL, 'utf-8') in headers['upgrade']):
-            # HTTP/1.1 requests that are upgrade to HTTP/2.0 are responded to with steam id of 1
-            headers[b':status'] = str(response.status)
-            raise HTTPUpgrade(H2C_PROTOCOL, self._sock, HTTP20Response(headers, ))
+            raise HTTPUpgrade(H2C_PROTOCOL, self._sock)
 
         return HTTP11Response(
             response.status,