diff options
| author | Curl Upstream <curl-library@lists.haxx.se> | 2022-12-21 07:00:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-27 20:58:30 (GMT) |
| commit | dac458ddbf2b48168779821654a7e69cbd828c14 (patch) | |
| tree | 8191fa2b92ceb3469c8ac5878b4ded3112f5f16c /lib/asyn-thread.c | |
| parent | ec122fff08ab9a8e56fb90126ecedb99c759011b (diff) | |
| download | CMake-dac458ddbf2b48168779821654a7e69cbd828c14.zip CMake-dac458ddbf2b48168779821654a7e69cbd828c14.tar.gz CMake-dac458ddbf2b48168779821654a7e69cbd828c14.tar.bz2 | |
curl 2022-12-21 (c12fb3dd)
Code extracted from:
https://github.com/curl/curl.git
at commit c12fb3ddaf48e709a7a4deaa55ec485e4df163ee (curl-7_87_0).
Diffstat (limited to 'lib/asyn-thread.c')
| -rw-r--r-- | lib/asyn-thread.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c index 8b375eb..705f0f6 100644 --- a/lib/asyn-thread.c +++ b/lib/asyn-thread.c @@ -44,19 +44,8 @@ #include <inet.h> #endif -#if defined(USE_THREADS_POSIX) -# ifdef HAVE_PTHREAD_H -# include <pthread.h> -# endif -#elif defined(USE_THREADS_WIN32) -# ifdef HAVE_PROCESS_H -# include <process.h> -# endif -#endif - -#if (defined(NETWARE) && defined(__NOVELL_LIBC__)) -#undef in_addr_t -#define in_addr_t unsigned long +#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H) +# include <pthread.h> #endif #ifdef HAVE_GETADDRINFO @@ -75,7 +64,6 @@ #include "inet_ntop.h" #include "curl_threads.h" #include "connect.h" -#include "socketpair.h" /* The last 3 #include files should be in this order */ #include "curl_printf.h" #include "curl_memory.h" @@ -541,7 +529,8 @@ void Curl_resolver_kill(struct Curl_easy *data) /* If we're still resolving, we must wait for the threads to fully clean up, unfortunately. Otherwise, we can simply cancel to clean up any resolver data. */ - if(td && td->thread_hnd != curl_thread_t_null) + if(td && td->thread_hnd != curl_thread_t_null + && (data->set.quick_exit != 1L)) (void)thread_wait_resolv(data, NULL, FALSE); else Curl_resolver_cancel(data); |