Fix issues not on pull request with host and port not being set properly, SSL connections for proxy ignored for now

Author: fredthomsen

hyper/http11/connection.py

@@ -107,13 +107,16 @@ def connect(self):
         if self._sock is None:
             if not self.proxy_host:
                 host = self.host
+                port = self.port
             else:
+                host = self.proxy_host
                 port = self.proxy_host
 
             sock = socket.create_connection((host, port), 5)
             proto = None
 
             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)
 
             log.debug("Selected protocol: %s", proto)

hyper/http20/connection.py

@@ -236,12 +236,15 @@ def connect(self):
         if self._sock is None:
             if not self.proxy_host:
                 host = self.host
+                port = self.port
             else:
+                host = self.proxy_host
                 port = self.proxy_host
 
             sock = socket.create_connection((host, port), 5)
 
             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)
             else:
                 proto = H2C_PROTOCOL

test/test_abstraction.py

@@ -8,28 +8,28 @@ class TestHTTPConnection(object):
     def test_h1_kwargs(self):
         c = HTTPConnection(
             'test', 443, secure=False, window_manager=True, enable_push=True,
-            ssl_context=False, proxies=False, other_kwarg=True
+            ssl_context=False, proxy=False, other_kwarg=True
         )
 
         assert c._h1_kwargs == {
             'secure': False,
             'ssl_context': False,
-            'proxies': False,
+            'proxy': False,
             'other_kwarg': True,
         }
 
     def test_h2_kwargs(self):
         c = HTTPConnection(
             'test', 443, secure=False, window_manager=True, enable_push=True,
-            ssl_context=True, proxies=False, other_kwarg=True
+            ssl_context=True, proxy=False, other_kwarg=True
         )
 
         assert c._h2_kwargs == {
             'window_manager': True,
             'enable_push': True,
             'secure': False,
             'ssl_context': True,
-            'proxies': False,
+            'proxy': False,
             'other_kwarg': True,
         }