Merge pull request #293 from qistoph/sni

Set SNI to Host header in HostHeaderSSLAdapter

AUTHORS.rst

@@ -54,4 +54,6 @@ Patches and Suggestions
 
 - Sam Bull (@greatestape)
 
-- Florence Blanc-Renaud <[email protected]> (@flo-renaud)
+- Chris van Marle (https://github.com/qistoph)
+
+- Florence Blanc-Renaud <[email protected]> (@flo-renaud)

docs/adapters.rst

@@ -77,6 +77,8 @@ Requests supports SSL Verification by default. However, it relies on
 the user making a request with the URL that has the hostname in it. If,
 however, the user needs to make a request with the IP address, they cannot
 actually verify a certificate against the hostname they want to request.
+This adapter sets the `Server Name Indication`_ to, and verifies the
+certificate against, the hostname in the Host header.
 
 To accomodate this very rare need, we've added
 :class:`~requests_toolbelt.adapters.host_header_ssl.HostHeaderSSLAdapter`.
@@ -92,6 +94,8 @@ Example usage:
 
 .. autoclass:: requests_toolbelt.adapters.host_header_ssl.HostHeaderSSLAdapter
 
+.. _Server Name Indication: https://en.wikipedia.org/wiki/Server_Name_Indication
+
 SourceAddressAdapter
 --------------------
 

requests_toolbelt/adapters/host_header_ssl.py

@@ -36,8 +36,10 @@ def send(self, request, **kwargs):
 
         if host_header:
             connection_pool_kwargs["assert_hostname"] = host_header
+            connection_pool_kwargs["server_hostname"] = host_header
         elif "assert_hostname" in connection_pool_kwargs:
             # an assert_hostname from a previous request may have been left
             connection_pool_kwargs.pop("assert_hostname", None)
+            connection_pool_kwargs.pop("server_hostname", None)
 
         return super(HostHeaderSSLAdapter, self).send(request, **kwargs)