moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

prevent all the sig and alarm stuff when using ares

This commit is contained in:
Daniel Stenberg 2004-07-29 08:06:33 +00:00
parent 48b92c163f
commit 0cfa9b52ae
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/url.c
View File

@ -2109,7 +2109,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
struct connectdata *conn_temp; struct connectdata *conn_temp;
size_t urllen; size_t urllen;
struct Curl_dns_entry *hostaddr; struct Curl_dns_entry *hostaddr;
#ifdef HAVE_ALARM #if defined(HAVE_ALARM) && !defined(USE_ARES)
unsigned int prev_alarm=0; unsigned int prev_alarm=0;
#endif #endif
char endbracket; char endbracket;
@ -2118,6 +2118,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
int rc; int rc;
bool reuse; bool reuse;
#ifndef USE_ARES
#ifdef SIGALRM #ifdef SIGALRM
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
struct sigaction keep_sigact; /* store the old struct here */ struct sigaction keep_sigact; /* store the old struct here */
@ -2125,9 +2126,10 @@ static CURLcode CreateConnection(struct SessionHandle *data,
#else #else
#ifdef HAVE_SIGNAL #ifdef HAVE_SIGNAL
void *keep_sigact; /* store the old handler here */ void *keep_sigact; /* store the old handler here */
#endif #endif /* HAVE_SIGNAL */
#endif #endif /* HAVE_SIGACTION */
#endif #endif /* SIGALRM */
#endif /* USE_ARES */
*addr = NULL; /* nothing yet */ *addr = NULL; /* nothing yet */
*async = FALSE; *async = FALSE;
@ -3266,7 +3268,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
} }
*addr = hostaddr; *addr = hostaddr;
#if defined(HAVE_ALARM) && defined(SIGALRM) #if defined(HAVE_ALARM) && defined(SIGALRM) && !defined(USE_ARES)
if((data->set.timeout || data->set.connecttimeout) && !data->set.no_signal) { if((data->set.timeout || data->set.connecttimeout) && !data->set.no_signal) {
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
if(keep_copysig) { if(keep_copysig) {