diff options
| -rw-r--r-- | lib/ftp.c | 2 | ||||
| -rw-r--r-- | lib/transfer.c | 4 | 
2 files changed, 1 insertions, 5 deletions
| @@ -353,8 +353,6 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)    CURLcode result;    int ftpcode; -  myalarm(0); /* switch off the alarm stuff */ -    ftp = (struct FTP *)malloc(sizeof(struct FTP));    if(!ftp)      return CURLE_OUT_OF_MEMORY; diff --git a/lib/transfer.c b/lib/transfer.c index dc628982b..0a4c93e55 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -220,8 +220,6 @@ Transfer(struct connectdata *c_conn)    hbufp = data->state.headerbuff; -  myalarm (0);			/* switch off the alarm-style timeout */ -    now = Curl_tvnow();    start = now; @@ -1127,7 +1125,7 @@ CURLcode Curl_perform(struct SessionHandle *data)    if(newurl)      free(newurl); -  /* make sure the alarm is switched off! */ +  /* make absolutely sure the alarm is switched off! */    if(data->set.timeout || data->set.connecttimeout)      myalarm(0); | 
