From: Wouter Wijngaards Date: Mon, 21 Aug 2017 14:15:32 +0000 (+0000) Subject: - Fix #1402: squelch invalid argument error for fd_set_block on windows. X-Git-Tag: release-1.6.6rc1~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8960d2c55efd8f94e548a70021ddc7c4b012b55;p=thirdparty%2Funbound.git - Fix #1402: squelch invalid argument error for fd_set_block on windows. git-svn-id: file:///svn/unbound/trunk@4306 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 439c0a215..140408c17 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -9,6 +9,7 @@ implemented causing TCP to fail. The fix allows fallback to regular TCP in this case and is also more robust for cases where connectx() fails for some reason. + - Fix #1402: squelch invalid argument error for fd_set_block on windows. 10 August 2017: Wouter - Patch to show DNSCrypt status in help output, from Carsten diff --git a/util/net_help.c b/util/net_help.c index 943f9dd7f..ce136a337 100644 --- a/util/net_help.c +++ b/util/net_help.c @@ -114,8 +114,9 @@ fd_set_block(int s) #elif defined(HAVE_IOCTLSOCKET) unsigned long off = 0; if(ioctlsocket(s, FIONBIO, &off) != 0) { - log_err("can't ioctlsocket FIONBIO off: %s", - wsa_strerror(WSAGetLastError())); + if(WSAGetLastError() != WSAEINVAL || verbosity >= 4) + log_err("can't ioctlsocket FIONBIO off: %s", + wsa_strerror(WSAGetLastError())); } #endif return 1;