Commit 21633b9bee199eb7a7de06eba0a9d0bb16abf0ec
2012-01-21T15:12:45
Bringing back TCP_NODELAY, but also ensuring it doesn't conflict with --net-delay : Nagle's may infact delay some packets longer than necessary..
diff --git a/util.c b/util.c
index 86fa2df..372da6c 100644
--- a/util.c
+++ b/util.c
@@ -336,6 +336,9 @@ json_t *json_rpc_call(CURL *curl, const char *url,
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_ENCODING, "");
curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+ if (!opt_delaynet) {
+ curl_easy_setopt(curl, CURLOPT_TCP_NODELAY, 1);
+ }
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, all_data_cb);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &all_data);
curl_easy_setopt(curl, CURLOPT_READFUNCTION, upload_data_cb);
@@ -736,6 +739,9 @@ bool get_dondata(char **url, char **userpass)
curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt(curl, CURLOPT_ENCODING, "");
curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+ if (!opt_delaynet) {
+ curl_easy_setopt(curl, CURLOPT_TCP_NODELAY, 1);
+ }
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, all_data_cb);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &all_data);
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curl_err_str);