X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=http.c;h=0cb42a85d146c406f8268be423aabeb9e0e90dd0;hb=6fe31e2e4cdb7ed5333107174e23fbf2e226e370;hp=14a7669cd427e101985d4acf8f3da3314937eeaa;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853;p=git.git

diff --git a/http.c b/http.c
index 14a7669c..0cb42a85 100644
--- a/http.c
+++ b/http.c
@@ -195,6 +195,8 @@ static CURL* get_curl_handle(void)
 	if (getenv("GIT_CURL_VERBOSE"))
 		curl_easy_setopt(result, CURLOPT_VERBOSE, 1);
 
+	curl_easy_setopt(result, CURLOPT_USERAGENT, GIT_USER_AGENT);
+
 	return result;
 }
 
@@ -339,6 +341,7 @@ struct active_request_slot *get_active_slot(void)
 	slot->in_use = 1;
 	slot->local = NULL;
 	slot->results = NULL;
+	slot->finished = NULL;
 	slot->callback_data = NULL;
 	slot->callback_func = NULL;
 	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, pragma_header);
@@ -389,8 +392,10 @@ void run_active_slot(struct active_request_slot *slot)
 	fd_set excfds;
 	int max_fd;
 	struct timeval select_timeout;
+	int finished = 0;
 
-	while (slot->in_use) {
+	slot->finished = &finished;
+	while (!finished) {
 		data_received = 0;
 		step_active_slots();
 
@@ -442,6 +447,9 @@ static void finish_active_slot(struct active_request_slot *slot)
 	closedown_active_slot(slot);
         curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code);
 
+	if (slot->finished != NULL)
+		(*slot->finished) = 1;
+
 	/* Store slot results so they can be read after the slot is reused */
 	if (slot->results != NULL) {
 		slot->results->curl_result = slot->curl_result;