summaryrefslogtreecommitdiff
path: root/docs/user
diff options
context:
space:
mode:
authorAaron Iles <aaron.iles@gmail.com>2014-02-02 22:19:10 +1100
committerAaron Iles <aaron.iles@gmail.com>2014-02-02 22:19:10 +1100
commit8a0bae45c2efa8706c76d8af925d0dcd727cfc32 (patch)
treea762f68faffeb60e73ffd11833190ca497609909 /docs/user
parentb5b8198fd1e872471f4523e0b450dfee33072242 (diff)
downloadpython-requests-8a0bae45c2efa8706c76d8af925d0dcd727cfc32.tar.gz
Move SNI documentation to FAQ
Relocate documentation on Server-Name-Indication from the advanced section to the frequently asked questions. This is minus details on enabling SNI on Python2, which is instead captured by linking to Stack Overflow.
Diffstat (limited to 'docs/user')
-rw-r--r--docs/user/advanced.rst27
1 files changed, 2 insertions, 25 deletions
diff --git a/docs/user/advanced.rst b/docs/user/advanced.rst
index 9df9f9b1..80c1e6ae 100644
--- a/docs/user/advanced.rst
+++ b/docs/user/advanced.rst
@@ -145,6 +145,8 @@ applied, replace the call to :meth:`Request.prepare()
print(resp.status_code)
+.. _verification:
+
SSL Cert Verification
---------------------
@@ -179,31 +181,6 @@ If you specify a wrong path or an invalid cert::
>>> requests.get('https://kennethreitz.com', cert='/wrong_path/server.pem')
SSLError: [Errno 336265225] _ssl.c:347: error:140B0009:SSL routines:SSL_CTX_use_PrivateKey_file:PEM lib
-Server Name Indication
-----------------------
-
-`Server Name Indication`_, or SNI, is an official extension to SSL where the
-client tells the server what hostname it is contacting. This enables `virtual
-hosting`_ on SSL protected sites.
-
-Python3's SSL module includes native support for SNI. This support has not been
-back ported to Python2. However, Requests will enable SNI support on Python2 if
-the following packages are installed:
-
-* `pyOpenSSL`_, a Python wrapper module around the OpenSSL library.
-* `ndg-httpsclient`_, enhanced HTTPS support for httplib and urllib2.
-* `pyasn1`_, ASN.1 types and codecs.
-
-When these packages are installed, Requests will automatically indicate to the
-server what hostname is being contacted. This allows the server to return the
-correct server certificate for SSL certificate verification.
-
-.. _`Server Name Indication`: https://en.wikipedia.org/wiki/Server_Name_Indication
-.. _`virtual hosting`: https://en.wikipedia.org/wiki/Virtual_hosting
-.. _`pyOpenSSL`: https://pypi.python.org/pypi/pyOpenSSL
-.. _`ndg-httpsclient`: https://pypi.python.org/pypi/ndg-httpsclient
-.. _`pyasn1`: https://pypi.python.org/pypi/pyasn1
-
Body Content Workflow
---------------------