moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

Fixed compile error in HAVE_SIGACTION case.

Browse Source
This commit is contained in:
Dan Fandrich 2006-10-17 21:45:37 +00:00
parent 44d84ac164
commit 8c38ea4ebc
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/url.c
View File

@ -3668,17 +3668,11 @@ static CURLcode CreateConnection(struct SessionHandle *data,
* Set signal handler to catch SIGALRM * Set signal handler to catch SIGALRM
* Store the old value to be able to set it back later! * Store the old value to be able to set it back later!
*************************************************************/ *************************************************************/
long shortest = data->set.timeout; /* default to this timeout value */
if(shortest && data->set.connecttimeout &&
(data->set.connecttimeout < shortest))
/* if both are set, pick the shortest */
shortest = data->set.connecttimeout;
else if(!shortest)
/* if timeout is not set, use the connect timeout */
shortest = data->set.connecttimeout;
#ifdef SIGALRM #ifdef SIGALRM
#ifdef HAVE_ALARM
long shortest;
#endif
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
struct sigaction sigact; struct sigaction sigact;
sigaction(SIGALRM, NULL, &sigact); sigaction(SIGALRM, NULL, &sigact);
@ -3704,6 +3698,15 @@ static CURLcode CreateConnection(struct SessionHandle *data,
* multi-threaded environments. */ * multi-threaded environments. */
#ifdef HAVE_ALARM #ifdef HAVE_ALARM
shortest = data->set.timeout; /* default to this timeout value */
if(shortest && data->set.connecttimeout &&
(data->set.connecttimeout < shortest))
/* if both are set, pick the shortest */
shortest = data->set.connecttimeout;
else if(!shortest)
/* if timeout is not set, use the connect timeout */
shortest = data->set.connecttimeout;
/* alarm() makes a signal get sent when the timeout fires off, and that /* alarm() makes a signal get sent when the timeout fires off, and that
will abort system calls */ will abort system calls */
prev_alarm = alarm((unsigned int) shortest); prev_alarm = alarm((unsigned int) shortest);