From: Matthias Wachs <wachs@net.in.tum.de>
Date: Mon, 27 Aug 2012 15:42:28 +0000 (+0000)
Subject: timeout
X-Git-Tag: initial-import-from-subversion-38251~12069
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f3e179a73854540af4900ca3a40a1ab6eb684b49;p=oweals%2Fgnunet.git

timeout
---

diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 1ae3325f6..eb601e30b 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -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);