1
0

001-curl-https-openssl-fix.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334
  1. From a7b38c9dc98481e4a5fc37e51a8690337c674dfb Mon Sep 17 00:00:00 2001
  2. From: Daniel Stenberg <daniel@haxx.se>
  3. Date: Mon, 26 Dec 2016 00:06:33 +0100
  4. Subject: [PATCH] vtls: s/SSLEAY/OPENSSL
  5. Fixed an old leftover use of the USE_SSLEAY define which would make a
  6. socket get removed from the applications sockets to monitor when the
  7. multi_socket API was used, leading to timeouts.
  8. Bug: #1174
  9. ---
  10. lib/vtls/vtls.c | 4 ++--
  11. 1 file changed, 2 insertions(+), 2 deletions(-)
  12. --- a/lib/vtls/vtls.c
  13. +++ b/lib/vtls/vtls.c
  14. @@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy
  15. curlssl_close_all(data);
  16. }
  17. -#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
  18. +#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
  19. defined(USE_DARWINSSL) || defined(USE_NSS)
  20. /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
  21. int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
  22. @@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata
  23. (void)numsocks;
  24. return GETSOCK_BLANK;
  25. }
  26. -/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
  27. +/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
  28. #endif
  29. void Curl_ssl_close(struct connectdata *conn, int sockindex)