forked from lede-project/source
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
curl: fix HTTPS network timeouts with OpenSSL
Backport an upstream change to fix HTTPS timeouts with OpenSSL. Upstream curl bug lede-project#1174. Signed-off-by: Stijn Segers <[email protected]> [Jo-Philipp Wich: reword commit message, rename patch to 001-*] Signed-off-by: Jo-Philipp Wich <[email protected]>
- Loading branch information
Showing
1 changed file
with
36 additions
and
0 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
package/network/utils/curl/patches/001-curl-https-openssl-fix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001 | ||
From: Daniel Stenberg <[email protected]> | ||
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) |