squash! gvfs-helper: expose gvfs/objects GET and POST semantics

For the t5799.13(no server) test case, we specifically work around a
change of behavior in cURL v8.16.0 where the generous default connection
timeout of 5 minutes started to be applied several times in instances
where a connection is refused. The work-around is to add the
`--connect-timeout-ms` option and set it really low in that test case.
Unfortunately, with that work-around that cURL version will report a
timeout instead of a failure to connect. See
curl/curl#18767 for details.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

gvfs-helper.c

@@ -375,6 +375,7 @@ static struct gh__global {
 	int cache_server_is_initialized; /* did sub-command look for one */
 	int main_creds_need_approval; /* try to only approve them once */
 
+	unsigned long connect_timeout_ms;
 } gh__global;
 
 enum gh__server_type {
@@ -2964,6 +2965,10 @@ static void do_req(const char *url_base,
 		curl_easy_setopt(slot->curl, CURLOPT_NOPROGRESS, 1L);
 	}
 
+	if (gh__global.connect_timeout_ms)
+		curl_easy_setopt(slot->curl, CURLOPT_CONNECTTIMEOUT_MS,
+				gh__global.connect_timeout_ms);
+
 	gh__run_one_slot(slot, params, status);
 	strbuf_release(&rest_url);
 }
@@ -3672,6 +3677,9 @@ static enum gh__error_code do_sub_cmd__get(int argc, const char **argv)
 	static struct option get_options[] = {
 		OPT_INTEGER('r', "max-retries", &gh__cmd_opts.max_retries,
 			    N_("retries for transient network errors")),
+		OPT_UNSIGNED(0, "connect-timeout-ms",
+			     &gh__global.connect_timeout_ms,
+			     N_("try to connect only for this many milliseconds")),
 		OPT_END(),
 	};
 

t/t5799-gvfs-helper.sh

@@ -850,6 +850,13 @@ mayhem_observed__close () {
 	fi
 }
 
+test_lazy_prereq CURL_8_16_0 '
+	case "$(curl --version | sed -n "1s/^curl \([^ ]*\).*/\1/p")" in
+	8.16.0) return 0;;
+	*) return 1;;
+	esac
+'
+
 test_expect_success 'curl-error: no server' '
 	test_when_finished "per_test_cleanup" &&
 
@@ -864,10 +871,18 @@ test_expect_success 'curl-error: no server' '
 		--remote=origin \
 		get \
 		--max-retries=2 \
+		--connect-timeout-ms=200 \
 		<"$OIDS_FILE" >OUT.output 2>OUT.stderr &&
 
-	# CURLE_COULDNT_CONNECT 7
-	test_grep "error: get: (curl:7)" OUT.stderr
+	if test_have_prereq CURL_8_16_0
+	then
+		# CURLE_COULDNT_CONNECT 7
+		# CURLE_OPERATION_TIMEDOUT 28
+		test_grep "error: get: (curl:\(7\|28\))" OUT.stderr
+	else
+		# CURLE_COULDNT_CONNECT 7
+		test_grep "error: get: (curl:7)" OUT.stderr
+	fi
 '
 
 test_expect_success 'curl-error: close socket while reading request' '