From: Junio C Hamano <junkio@cox.net>
Date: Wed, 15 Mar 2006 17:12:18 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~28
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d7da67148bd672b4e575da9b4e8cf509190f8491?hp=d09a0a3cb862ead8bb7eec30439cb0eed41e91e3

Merge branch 'master' into next

* master:
Fix broken slot reuse when fetching alternates
---

diff --git a/http-fetch.c b/http-fetch.c
index 8fd9de081f..7de818b109 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -468,9 +468,13 @@ static void process_alternates_response(void *callback_data)
 					 alt_req->url);
 			active_requests++;
 			slot->in_use = 1;
+			if (slot->finished != NULL)
+				(*slot->finished) = 0;
 			if (!start_active_slot(slot)) {
 				got_alternates = -1;
 				slot->in_use = 0;
+				if (slot->finished != NULL)
+					(*slot->finished) = 1;
 			}
 			return;
 		}