Attachment 178590 Details for Bug 215843 – Fix for the multi_socket timeouts issue

[patch] Fix for the multi_socket timeouts issue

multi_socket-timeouts-fix.diff (text/plain), 1.98 KB, created by marek on 2017-01-06 22:46:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: marek

Created: 2017-01-06 22:46:16 UTC

Size: 1.98 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 430749)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	curl
> PORTVERSION=	7.52.1
>+PORTREVISION=	1
> CATEGORIES=	ftp net www
> MASTER_SITES=	http://curl.haxx.se/download/ \
> 		LOCAL/sunpoet
>Index: files/patch-lib_vtls_vtls.c
>===================================================================
>--- files/patch-lib_vtls_vtls.c	(nonexistent)
>+++ files/patch-lib_vtls_vtls.c	(working copy)
>@@ -0,0 +1,27 @@
>+Description: 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.
>+Forwarded: not-needed
>+Author: Daniel Stenberg <daniel@haxx.se>
>+Last-Update: 2016-12-26
>+
>+--- lib/vtls/vtls.c.orig	2016-12-19 07:27:56 UTC
>++++ lib/vtls/vtls.c
>+@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy
>+   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 
>+   (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)
>
>Property changes on: files/patch-lib_vtls_vtls.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 215843: 178590