diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2011-10-04 08:30:57 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2011-10-04 08:30:57 +0000 |
commit | a73989c1d1334406bf9319f54eff34b987b985f8 (patch) | |
tree | 2e1ebd80d6c69c3dd6f1df3fa528d980543e9fdd /src/transport/plugin_transport_http_client.c | |
parent | 06e247a83238ace88b3705e4551bc01b44cfe166 (diff) | |
download | gnunet-a73989c1d1334406bf9319f54eff34b987b985f8.tar.gz gnunet-a73989c1d1334406bf9319f54eff34b987b985f8.zip |
re-enabling timeouts
Diffstat (limited to 'src/transport/plugin_transport_http_client.c')
-rw-r--r-- | src/transport/plugin_transport_http_client.c | 12 |
1 files changed, 4 insertions, 8 deletions
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) | |||
507 | curl_easy_setopt (s->client_get, CURLOPT_WRITEFUNCTION, client_receive); | 507 | curl_easy_setopt (s->client_get, CURLOPT_WRITEFUNCTION, client_receive); |
508 | curl_easy_setopt (s->client_get, CURLOPT_WRITEDATA, s); | 508 | curl_easy_setopt (s->client_get, CURLOPT_WRITEDATA, s); |
509 | curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT_MS, | 509 | curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT_MS, |
510 | 30000); | 510 | (long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
511 | //(long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | ||
512 | curl_easy_setopt (s->client_get, CURLOPT_PRIVATE, s); | 511 | curl_easy_setopt (s->client_get, CURLOPT_PRIVATE, s); |
513 | curl_easy_setopt (s->client_get, CURLOPT_CONNECTTIMEOUT_MS, | 512 | curl_easy_setopt (s->client_get, CURLOPT_CONNECTTIMEOUT_MS, |
514 | 30000); | 513 | (long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value); |
515 | //(long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value); | ||
516 | curl_easy_setopt (s->client_get, CURLOPT_BUFFERSIZE, | 514 | curl_easy_setopt (s->client_get, CURLOPT_BUFFERSIZE, |
517 | 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); | 515 | 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); |
518 | #if CURL_TCP_NODELAY | 516 | #if CURL_TCP_NODELAY |
@@ -540,12 +538,10 @@ client_connect (struct Session *s) | |||
540 | curl_easy_setopt (s->client_put, CURLOPT_WRITEFUNCTION, client_receive); | 538 | curl_easy_setopt (s->client_put, CURLOPT_WRITEFUNCTION, client_receive); |
541 | curl_easy_setopt (s->client_put, CURLOPT_WRITEDATA, s); | 539 | curl_easy_setopt (s->client_put, CURLOPT_WRITEDATA, s); |
542 | curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT_MS, | 540 | curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT_MS, |
543 | 300000); | 541 | (long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); |
544 | //(long) GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value); | ||
545 | curl_easy_setopt (s->client_put, CURLOPT_PRIVATE, s); | 542 | curl_easy_setopt (s->client_put, CURLOPT_PRIVATE, s); |
546 | curl_easy_setopt (s->client_put, CURLOPT_CONNECTTIMEOUT_MS, | 543 | curl_easy_setopt (s->client_put, CURLOPT_CONNECTTIMEOUT_MS, |
547 | 300000); | 544 | (long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value); |
548 | //(long) HTTP_NOT_VALIDATED_TIMEOUT.rel_value); | ||
549 | curl_easy_setopt (s->client_put, CURLOPT_BUFFERSIZE, | 545 | curl_easy_setopt (s->client_put, CURLOPT_BUFFERSIZE, |
550 | 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); | 546 | 2 * GNUNET_SERVER_MAX_MESSAGE_SIZE); |
551 | #if CURL_TCP_NODELAY | 547 | #if CURL_TCP_NODELAY |