From: Matthias Wachs Date: Tue, 4 Oct 2011 08:30:57 +0000 (+0000) Subject: re-enabling timeouts X-Git-Tag: initial-import-from-subversion-38251~16836 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a73989c1d1334406bf9319f54eff34b987b985f8;p=oweals%2Fgnunet.git re-enabling timeouts --- diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index ebce5659f..68b9b50c1 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c @@ -507,12 +507,10 @@ client_connect (struct Session *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, - 30000); - //(long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); + (long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); curl_easy_setopt (s->client_get, CURLOPT_PRIVATE, s); curl_easy_setopt (s->client_get, CURLOPT_CONNECTTIMEOUT_MS, - 30000); - //(long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value); + (long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value); curl_easy_setopt (s->client_get, CURLOPT_BUFFERSIZE, 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); #if CURL_TCP_NODELAY @@ -540,12 +538,10 @@ client_connect (struct Session *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, - 300000); - //(long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); + (long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); curl_easy_setopt (s->client_put, CURLOPT_PRIVATE, s); curl_easy_setopt (s->client_put, CURLOPT_CONNECTTIMEOUT_MS, - 300000); - //(long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value); + (long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value); curl_easy_setopt (s->client_put, CURLOPT_BUFFERSIZE, 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); #if CURL_TCP_NODELAY