aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/transfer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/transfer.c b/lib/transfer.c
index 4ce6f32aa..1f2c6886f 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -960,6 +960,10 @@ CURLcode Curl_perform(CURL *curl)
conn->newurl = NULL;
}
+ /* make sure the alarm is switched off! */
+ if(data->timeout || data->connecttimeout)
+ myalarm(0);
+
return res;
}