From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 27 Mar 2001 21:24:46 +0000 (+0000)
Subject: make sure the alarm is off when returning from curl_easy_perform()
X-Git-Tag: curl-7_7_1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e65062be2e4b5147c10e2b9826fed99678f6169;p=thirdparty%2Fcurl.git

make sure the alarm is off when returning from curl_easy_perform()
---

diff --git a/lib/transfer.c b/lib/transfer.c
index 4ce6f32aaf..1f2c6886fe 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;
 }