mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'rc/maint-http-local-slot-fix'
* rc/maint-http-local-slot-fix: http*: cleanup slot->local after fclose
This commit is contained in:
commit
fa71e80525
|
@ -724,9 +724,11 @@ static void finish_request(struct transfer_request *request)
|
|||
struct stat st;
|
||||
struct packed_git *target;
|
||||
struct packed_git **lst;
|
||||
struct active_request_slot *slot;
|
||||
|
||||
request->curl_result = request->slot->curl_result;
|
||||
request->http_code = request->slot->http_code;
|
||||
slot = request->slot;
|
||||
request->slot = NULL;
|
||||
|
||||
/* Keep locks active */
|
||||
|
@ -823,6 +825,7 @@ static void finish_request(struct transfer_request *request)
|
|||
|
||||
fclose(request->local_stream);
|
||||
request->local_stream = NULL;
|
||||
slot->local = NULL;
|
||||
if (!move_temp_to_file(request->tmpfile,
|
||||
request->filename)) {
|
||||
target = (struct packed_git *)request->userData;
|
||||
|
@ -1024,17 +1027,20 @@ static int fetch_index(unsigned char *sha1)
|
|||
if (results.curl_result != CURLE_OK) {
|
||||
free(url);
|
||||
fclose(indexfile);
|
||||
slot->local = NULL;
|
||||
return error("Unable to get pack index %s\n%s", url,
|
||||
curl_errorstr);
|
||||
}
|
||||
} else {
|
||||
free(url);
|
||||
fclose(indexfile);
|
||||
slot->local = NULL;
|
||||
return error("Unable to start request");
|
||||
}
|
||||
|
||||
free(url);
|
||||
fclose(indexfile);
|
||||
slot->local = NULL;
|
||||
|
||||
return move_temp_to_file(tmpfile, filename);
|
||||
}
|
||||
|
|
|
@ -418,15 +418,18 @@ static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned ch
|
|||
run_active_slot(slot);
|
||||
if (results.curl_result != CURLE_OK) {
|
||||
fclose(indexfile);
|
||||
slot->local = NULL;
|
||||
return error("Unable to get pack index %s\n%s", url,
|
||||
curl_errorstr);
|
||||
}
|
||||
} else {
|
||||
fclose(indexfile);
|
||||
slot->local = NULL;
|
||||
return error("Unable to start request");
|
||||
}
|
||||
|
||||
fclose(indexfile);
|
||||
slot->local = NULL;
|
||||
|
||||
return move_temp_to_file(tmpfile, filename);
|
||||
}
|
||||
|
@ -776,16 +779,19 @@ static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned cha
|
|||
run_active_slot(slot);
|
||||
if (results.curl_result != CURLE_OK) {
|
||||
fclose(packfile);
|
||||
slot->local = NULL;
|
||||
return error("Unable to get pack file %s\n%s", url,
|
||||
curl_errorstr);
|
||||
}
|
||||
} else {
|
||||
fclose(packfile);
|
||||
slot->local = NULL;
|
||||
return error("Unable to start request");
|
||||
}
|
||||
|
||||
target->pack_size = ftell(packfile);
|
||||
fclose(packfile);
|
||||
slot->local = NULL;
|
||||
|
||||
ret = move_temp_to_file(tmpfile, filename);
|
||||
if (ret)
|
||||
|
|
Loading…
Reference in a new issue