diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-05 16:50:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-05 16:50:43 (GMT) |
| commit | f8a1ba202f51e70510f12f46fe0633ea908d5144 (patch) | |
| tree | fe7f931cdb5c0049cd97660e3888a816dfd4a86f /Utilities/cmcurl/lib/hostip.c | |
| parent | 25d7b1ca9d3a160850ad1f147ff96ac7c55f7d9f (diff) | |
| parent | 93cc249f3dd7ecd621cd063e4c08bbdb54d971e8 (diff) | |
| download | CMake-f8a1ba202f51e70510f12f46fe0633ea908d5144.zip CMake-f8a1ba202f51e70510f12f46fe0633ea908d5144.tar.gz CMake-f8a1ba202f51e70510f12f46fe0633ea908d5144.tar.bz2 | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2016-11-02 (3c561c65)
Diffstat (limited to 'Utilities/cmcurl/lib/hostip.c')
| -rw-r--r-- | Utilities/cmcurl/lib/hostip.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Utilities/cmcurl/lib/hostip.c b/Utilities/cmcurl/lib/hostip.c index f2d9841..24a922e 100644 --- a/Utilities/cmcurl/lib/hostip.c +++ b/Utilities/cmcurl/lib/hostip.c @@ -603,11 +603,14 @@ int Curl_resolv_timeout(struct connectdata *conn, /* USE_ALARM_TIMEOUT defined, but no timeout actually requested */ return Curl_resolv(conn, hostname, port, entry); - if(timeout < 1000) + if(timeout < 1000) { /* The alarm() function only provides integer second resolution, so if we want to wait less than one second we must bail out already now. */ + failf(data, + "remaining timeout of %ld too small to resolve via SIGALRM method", + timeout); return CURLRESOLV_TIMEDOUT; - + } /* This allows us to time-out from the name resolver, as the timeout will generate a signal and we will siglongjmp() from that here. This technique has problems (see alarmfunc). |