Merge branch 'master' into next

* master: Fix broken slot reuse when fetching alternates
2006-03-15 09:12:18 -08:00
parent d09a0a3cb8 c982647310
commit d7da67148b
1 changed files with 4 additions and 0 deletions
--- 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;
 		}