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

[John Crispin]

Hi,

On 08/01/2017 15:29, Stijn Segers wrote:
> Fixes HTTPS timeouts with OpenSSL. Upstream curl bug #1174.
> 
> Upstream commit message:
> 
> 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.
> 
> Signed-off-by: Stijn Segers <francesco.borromini at inventati.org>
> ---
>  .../curl/patches/320-curl-https-openssl-fix.patch  | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>  create mode 100644 package/network/utils/curl/patches/320-curl-https-openssl-fix.patch
> 


it looks like you only added the patch body. if this is an upstream
comit, then please add the fully annotated upstream patch.

	John

> 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..9ecb2a95f8
> --- /dev/null
> +++ b/package/network/utils/curl/patches/320-curl-https-openssl-fix.patch
> @@ -0,0 +1,22 @@
> +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)
>