[LEDE-DEV] [PATCH v3] Curl: fix HTTPS network timeouts with OpenSSL

[Stijn Segers]

Hi John,

I hope this works better then? Wasn't too sure about leaving in the e-mail etc.
from upstream.

This patch fixes HTTPS timeouts with OpenSSL. Upstream curl bug #1174.

Cheers!

Stijn

Signed-off-by: Stijn Segers <francesco.borromini at inventati.org>
---
 .../curl/patches/320-curl-https-openssl-fix.patch  | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 package/network/utils/curl/patches/320-curl-https-openssl-fix.patch

diff --git a/package/network/utils/curl/patches/320-curl-https-openssl-fix.patch b/package/network/utils/curl/patches/320-curl-https-openssl-fix.patch
new file mode 100644
index 0000000000..259f618d46
--- /dev/null
+++ b/package/network/utils/curl/patches/320-curl-https-openssl-fix.patch
@@ -0,0 +1,36 @@
+From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Mon, 26 Dec 2016 00:06:33 +0100
+Subject: [PATCH] vtls: s/SSLEAY/OPENSSL
+
+Fixed an old leftover use of the USE_SSLEAY define which would make a
+socket get removed from the applications sockets to monitor when the
+multi_socket API was used, leading to timeouts.
+
+Bug: #1174
+---
+ lib/vtls/vtls.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
+index b808e1c..707f24b 100644
+--- a/lib/vtls/vtls.c
++++ b/lib/vtls/vtls.c
+@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
+   curlssl_close_all(data);
+ }
+ 
+-#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
++#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
+     defined(USE_DARWINSSL) || defined(USE_NSS)
+ /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
+ int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
+@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
+   (void)numsocks;
+   return GETSOCK_BLANK;
+ }
+-/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
++/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
+ #endif
+ 
+ void Curl_ssl_close(struct connectdata *conn, int sockindex)
-- 
2.11.0