Issue #749: Add optional SNI support for python2.

SNI support will be enabled for python2 if ndg-httpsclient and pyopenssl are available.

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 2fae296674efe7616dad17851b3383f31e63936a..d31983438a47570cdf60a2f63c04982db57c839b 100644 (file)
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -125,3 +125,4 @@ Patches and Suggestions
 - Dmitry Medvinsky <me@dmedvinsky.name>
 - Bryce Boe <bbzbryce@gmail.com> @bboe
 - Colin Dunklau <colin.dunklau@gmail.com> @cdunklau
+- Hugo Osvaldo Barrera <hugo@osvaldobarrera.com.ar> @hobarrera

diff --git a/requests/__init__.py b/requests/__init__.py
index 1ea4aff4e0561760ea5209f5890d5b78e706cf32..2dd194b02d6b4e3e2ba4d69f8220192f25cb0f09 100644 (file)
--- a/requests/__init__.py
+++ b/requests/__init__.py
@@ -48,6 +48,12 @@ __author__ = 'Kenneth Reitz'
 __license__ = 'Apache 2.0'
 __copyright__ = 'Copyright 2013 Kenneth Reitz'
 
+# Attempt to enable urllib3's SNI support, if possible
+try:
+    from requests.packages.urllib3.contrib import pyopenssl
+    pyopenssl.inject_into_urllib3()
+except ImportError:
+    pass
 
 from . import utils
 from .models import Request, Response, PreparedRequest

diff --git a/setup.py b/setup.py
index 3425a41e06feac49f7d89cbef42a7e8cf4f24b3d..2b93ba9efd61077fe1d8a67a33b43c6bfa6dc681 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -20,6 +20,7 @@ packages = [
     'requests.packages.charade',
     'requests.packages.urllib3',
     'requests.packages.urllib3.packages',
+    'requests.packages.urllib3.contrib',
     'requests.packages.urllib3.packages.ssl_match_hostname'
 ]