X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=http.c;h=5926c5b3f7bbc781d77e2348db2990bcb51460e6;hb=edf563fbaa2ab50734db4a61e9092f25fbb5a417;hp=14d535747d943c2db3d45d82439f3ee9633ed2d9;hpb=2f74fb56c418d237a620eba4c507ae1f1ca28966;p=~andy%2Fgit diff --git a/http.c b/http.c index 14d535747..5926c5b3f 100644 --- a/http.c +++ b/http.c @@ -719,7 +719,9 @@ void append_remote_object_url(struct strbuf *buf, const char *url, const char *hex, int only_two_digit_prefix) { - strbuf_addf(buf, "%s/objects/%.*s/", url, 2, hex); + end_url_with_slash(buf, url); + + strbuf_addf(buf, "objects/%.*s/", 2, hex); if (!only_two_digit_prefix) strbuf_addf(buf, "%s", hex+2); } @@ -1287,5 +1289,10 @@ void release_http_object_request(struct http_object_request *freq) free(freq->url); freq->url = NULL; } - freq->slot = NULL; + if (freq->slot != NULL) { + freq->slot->callback_func = NULL; + freq->slot->callback_data = NULL; + release_active_slot(freq->slot); + freq->slot = NULL; + } }