diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-02-14 16:16:54 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-02-17 00:08:48 +0100 |
| commit | 4a4b63daaa01ef59b131d91e8e6e6dfe275c0f08 (patch) | |
| tree | 0d8804b728da55d1296431b1eeb7f446b9e460a5 /lib/hostip.c | |
| parent | d60b1b37a1682dee3a53bc6e15b44ecab9811297 (diff) | |
| download | curl-4a4b63daaa01ef59b131d91e8e6e6dfe275c0f08.tar.gz | |
socks: make the connect phase non-blocking
Removes two entries from KNOWN_BUGS.
Closes #4907
Diffstat (limited to 'lib/hostip.c')
| -rw-r--r-- | lib/hostip.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/hostip.c b/lib/hostip.c index 9c0464ceb..c0feb79fb 100644 --- a/lib/hostip.c +++ b/lib/hostip.c @@ -483,16 +483,16 @@ Curl_cache_addr(struct Curl_easy *data, * CURLRESOLV_PENDING (1) = waiting for response, no pointer */ -int Curl_resolv(struct connectdata *conn, - const char *hostname, - int port, - bool allowDOH, - struct Curl_dns_entry **entry) +enum resolve_t Curl_resolv(struct connectdata *conn, + const char *hostname, + int port, + bool allowDOH, + struct Curl_dns_entry **entry) { struct Curl_dns_entry *dns = NULL; struct Curl_easy *data = conn->data; CURLcode result; - int rc = CURLRESOLV_ERROR; /* default to failure */ + enum resolve_t rc = CURLRESOLV_ERROR; /* default to failure */ *entry = NULL; @@ -642,11 +642,11 @@ RETSIGTYPE alarmfunc(int sig) * CURLRESOLV_PENDING (1) = waiting for response, no pointer */ -int Curl_resolv_timeout(struct connectdata *conn, - const char *hostname, - int port, - struct Curl_dns_entry **entry, - timediff_t timeoutms) +enum resolve_t Curl_resolv_timeout(struct connectdata *conn, + const char *hostname, + int port, + struct Curl_dns_entry **entry, + timediff_t timeoutms) { #ifdef USE_ALARM_TIMEOUT #ifdef HAVE_SIGACTION @@ -662,7 +662,7 @@ int Curl_resolv_timeout(struct connectdata *conn, volatile unsigned int prev_alarm = 0; struct Curl_easy *data = conn->data; #endif /* USE_ALARM_TIMEOUT */ - int rc; + enum resolve_t rc; *entry = NULL; |