D55293.diff
No OneTemporary
Actions

Size

781 B

Referenced Files

None

Subscribers

None

D55293.diff
View Options

	diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
	--- a/lib/libfetch/common.c
	+++ b/lib/libfetch/common.c
	@@ -286,6 +286,9 @@
	flags = fcntl(sd, F_GETFD);
	if (flags != -1 && (flags & FD_CLOEXEC) == 0)
	(void)fcntl(sd, F_SETFD, flags \| FD_CLOEXEC);
	+ flags = fcntl(sd, F_GETFL);
	+ if (flags != -1 && (flags & O_NONBLOCK) == 0)
	+ (void)fcntl(sd, F_SETFL, flags \| O_NONBLOCK);
	(void)setsockopt(sd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
	conn->sd = sd;
	++conn->ref;
	@@ -1271,14 +1274,6 @@
	{
	ssize_t rlen;
	int ssl_err;
	- struct timeval tv;
	-
	- if (fetchTimeout > 0) {
	- tv.tv_sec = fetchTimeout;
	- tv.tv_usec = 0;
	- setsockopt(SSL_get_fd(ssl), SOL_SOCKET, SO_RCVTIMEO,
	- &tv, sizeof(tv));
	- }

	rlen = SSL_read(ssl, buf, len);
	if (rlen < 0) {