diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2015-03-16 02:53:20 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2015-03-16 02:53:20 +0000 |
| commit | bfdec437376b65cc03626f27bf850b47d65c24d9 (patch) | |
| tree | 97be47bfbfe9ca77cb9a7896f5b9833656dd1079 | |
| parent | 140fa9de439ee29a87f5670b7620906c3fa65326 (diff) | |
| download | python-requests-bfdec437376b65cc03626f27bf850b47d65c24d9.tar python-requests-bfdec437376b65cc03626f27bf850b47d65c24d9.tar.gz | |
Revert my fix for #770172 since it is not an RC bug while I need to fix #780506
| -rw-r--r-- | debian/patches/05_do-not-ascribe-cookies-to-the-target-domain.patch (renamed from debian/patches/06_do-not-ascribe-cookies-to-the-target-domain.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/05_do-not-make-SSLv3-mandatory.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
3 files changed, 1 insertions, 27 deletions
diff --git a/debian/patches/06_do-not-ascribe-cookies-to-the-target-domain.patch b/debian/patches/05_do-not-ascribe-cookies-to-the-target-domain.patch index 3dd3bba..3dd3bba 100644 --- a/debian/patches/06_do-not-ascribe-cookies-to-the-target-domain.patch +++ b/debian/patches/05_do-not-ascribe-cookies-to-the-target-domain.patch diff --git a/debian/patches/05_do-not-make-SSLv3-mandatory.patch b/debian/patches/05_do-not-make-SSLv3-mandatory.patch deleted file mode 100644 index dbeef77..0000000 --- a/debian/patches/05_do-not-make-SSLv3-mandatory.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Since SSL version 3 is insecure it is supported only if Python - supports it. In Debian SSL version 3 is disabled in system Python since - 2.7.8-12. -Author: Daniele Tricoli <eriol@mornie.org> -Forwarded: https://github.com/shazow/urllib3/issues/487#issuecomment-63805742 -Last/Update: 2014-11-20 - ---- a/requests/packages/urllib3/contrib/pyopenssl.py -+++ b/requests/packages/urllib3/contrib/pyopenssl.py -@@ -70,9 +70,14 @@ - # Map from urllib3 to PyOpenSSL compatible parameter-values. - _openssl_versions = { - ssl.PROTOCOL_SSLv23: OpenSSL.SSL.SSLv23_METHOD, -- ssl.PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD, - ssl.PROTOCOL_TLSv1: OpenSSL.SSL.TLSv1_METHOD, - } -+ -+try: -+ _openssl_versions.update({ssl.PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD}) -+except AttributeError: -+ pass -+ - _openssl_verify = { - ssl.CERT_NONE: OpenSSL.SSL.VERIFY_NONE, - ssl.CERT_OPTIONAL: OpenSSL.SSL.VERIFY_PEER, diff --git a/debian/patches/series b/debian/patches/series index af44331..bcd27f4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ 02_use-system-chardet-and-urllib3.patch 03_export-IncompleteRead.patch 04_make-requests.packages.urllib3-same-as-urllib3.patch -05_do-not-make-SSLv3-mandatory.patch -06_do-not-ascribe-cookies-to-the-target-domain.patch +05_do-not-ascribe-cookies-to-the-target-domain.patch |