[GNUnet-SVN] r23445 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2012-08-27 17:42:28 +0200 (Mon, 27 Aug 2012)
New Revision: 23445

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
Log:
timeout


Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2012-08-27 15:33:43 UTC 
(rev 23444)
+++ gnunet/src/transport/plugin_transport_http_client.c 2012-08-27 15:42:28 UTC 
(rev 23445)
@@ -964,8 +964,8 @@
   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 @@
   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);