From 1832b20c40235e3862ddefed7b58f12056a15956 Mon Sep 17 00:00:00 2001 From: ckolivas Date: Sat, 4 Feb 2012 20:04:07 +1100 Subject: [PATCH] Revert "Some networks can take a long time to resolve so go back to 60 second timeouts instead of 15." This reverts commit c86a670ce6d264fba10a38f68d65e4b4ab27cba6. This changed more than just the timeout. --- util.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/util.c b/util.c index 03ca034a..62abb34b 100644 --- a/util.c +++ b/util.c @@ -319,7 +319,13 @@ json_t *json_rpc_call(CURL *curl, const char *url, struct header_info hi = { }; bool probing = false; - /* it is assumed that 'curl' is freshly [re]initialised at this pt */ + /* it is assumed that 'curl' is freshly [re]initialized at this pt */ + + if (probe) { + probing = !pool->probed; + /* Probe for only 15 seconds */ + timeout = 15; + } curl_easy_setopt(curl, CURLOPT_TIMEOUT, timeout); #if 0 /* Disable curl debugging since it spews to stderr */