aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/ftp.c2
-rw-r--r--lib/transfer.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/ftp.c b/lib/ftp.c
index 5576a3013..38d9d7021 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -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);