|
 |
7955f6 |
From 36dcccb94bef72a7c4cf6acf7479f18568e545bb Mon Sep 17 00:00:00 2001
|
|
|
7955f6 |
From: Kamil Dudka <kdudka@redhat.com>
|
|
|
7955f6 |
Date: Tue, 2 May 2017 17:19:20 +0200
|
|
|
7955f6 |
Subject: [PATCH] module: drop link-time vs. run-time TLS backend check
|
|
|
7955f6 |
|
|
|
7955f6 |
This effectively reverts the following commit:
|
|
|
7955f6 |
8891398a31119ce7c872509ed60328926c51cdfb
|
|
|
7955f6 |
|
|
|
7955f6 |
Bug: https://bugzilla.redhat.com/1446850
|
|
|
7955f6 |
---
|
|
|
7955f6 |
src/module.c | 20 +-------------------
|
|
|
7955f6 |
1 file changed, 1 insertion(+), 19 deletions(-)
|
|
|
7955f6 |
|
|
|
7955f6 |
diff --git a/src/module.c b/src/module.c
|
|
|
7955f6 |
index a7108a0..af79875 100644
|
|
|
7955f6 |
--- a/src/module.c
|
|
|
7955f6 |
+++ b/src/module.c
|
|
|
7955f6 |
@@ -322,7 +322,7 @@ initpycurl(void)
|
|
|
7955f6 |
{
|
|
|
7955f6 |
PyObject *m, *d;
|
|
|
7955f6 |
const curl_version_info_data *vi;
|
|
|
7955f6 |
- const char *libcurl_version, *runtime_ssl_lib;
|
|
|
7955f6 |
+ const char *libcurl_version;
|
|
|
7955f6 |
size_t libcurl_version_len, pycurl_version_len;
|
|
|
7955f6 |
PyObject *xio_module = NULL;
|
|
|
7955f6 |
PyObject *collections_module = NULL;
|
|
|
7955f6 |
@@ -345,24 +345,6 @@ initpycurl(void)
|
|
|
7955f6 |
goto error;
|
|
|
7955f6 |
}
|
|
|
7955f6 |
|
|
|
7955f6 |
- /* Our compiled crypto locks should correspond to runtime ssl library. */
|
|
|
7955f6 |
- if (vi->ssl_version == NULL) {
|
|
|
7955f6 |
- runtime_ssl_lib = "none/other";
|
|
|
7955f6 |
- } else if (!strncmp(vi->ssl_version, "OpenSSL/", 8) || !strncmp(vi->ssl_version, "LibreSSL/", 9) ||
|
|
|
7955f6 |
- !strncmp(vi->ssl_version, "BoringSSL", 9)) {
|
|
|
7955f6 |
- runtime_ssl_lib = "openssl";
|
|
|
7955f6 |
- } else if (!strncmp(vi->ssl_version, "GnuTLS/", 7)) {
|
|
|
7955f6 |
- runtime_ssl_lib = "gnutls";
|
|
|
7955f6 |
- } else if (!strncmp(vi->ssl_version, "NSS/", 4)) {
|
|
|
7955f6 |
- runtime_ssl_lib = "nss";
|
|
|
7955f6 |
- } else {
|
|
|
7955f6 |
- runtime_ssl_lib = "none/other";
|
|
|
7955f6 |
- }
|
|
|
7955f6 |
- if (strcmp(runtime_ssl_lib, COMPILE_SSL_LIB)) {
|
|
|
7955f6 |
- PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backend (%s) is different from compile-time ssl backend (%s)", runtime_ssl_lib, COMPILE_SSL_LIB);
|
|
|
7955f6 |
- goto error;
|
|
|
7955f6 |
- }
|
|
|
7955f6 |
-
|
|
|
7955f6 |
/* Initialize the type of the new type objects here; doing it here
|
|
|
7955f6 |
* is required for portability to Windows without requiring C++. */
|
|
|
7955f6 |
p_Curl_Type = &Curl_Type;
|
|
|
7955f6 |
--
|
|
|
7955f6 |
2.10.2
|
|
|
7955f6 |
|