timeout
authorMatthias Wachs <wachs@net.in.tum.de>
Mon, 27 Aug 2012 15:42:28 +0000 (15:42 +0000)
committerMatthias Wachs <wachs@net.in.tum.de>
Mon, 27 Aug 2012 15:42:28 +0000 (15:42 +0000)
src/transport/plugin_transport_http_client.c

index 1ae3325f6630460eb5922e3169a3908e0f1d5a22..eb601e30b1f8559de2b14434e0a3183eaf8ae0b2 100644 (file)
@@ -964,8 +964,8 @@ client_connect (struct Session *s)
   curl_easy_setopt (s->client_get, CURLOPT_READDATA, s);
   curl_easy_setopt (s->client_get, CURLOPT_WRITEFUNCTION, client_receive);
   curl_easy_setopt (s->client_get, CURLOPT_WRITEDATA, s);
-  curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT_MS,
-                    (long) CLIENT_SESSION_TIMEOUT.rel_value);
+  /* No timeout by default, timeout done with session timeout */
+  curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT, 0);
   curl_easy_setopt (s->client_get, CURLOPT_PRIVATE, s);
   curl_easy_setopt (s->client_get, CURLOPT_CONNECTTIMEOUT_MS,
                     (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value);
@@ -995,8 +995,8 @@ client_connect (struct Session *s)
   curl_easy_setopt (s->client_put, CURLOPT_READDATA, s);
   curl_easy_setopt (s->client_put, CURLOPT_WRITEFUNCTION, client_receive);
   curl_easy_setopt (s->client_put, CURLOPT_WRITEDATA, s);
-  curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT_MS,
-                    (long) CLIENT_SESSION_TIMEOUT.rel_value);
+  /* No timeout by default, timeout done with session timeout */
+  curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT, 0);
   curl_easy_setopt (s->client_put, CURLOPT_PRIVATE, s);
   curl_easy_setopt (s->client_put, CURLOPT_CONNECTTIMEOUT_MS,
                     (long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value);