From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 29 Aug 2009 02:34:16 +0000 (-0700)
Subject: Merge branch 'rc/maint-http-fix' into maint
X-Git-Tag: v1.6.4.2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/48ae73b11487e12f8f7198e18779e65500d4ca0c?hp=-c

Merge branch 'rc/maint-http-fix' into maint

* rc/maint-http-fix:
http.c: don't assume that urls don't end with slash
---

48ae73b11487e12f8f7198e18779e65500d4ca0c
diff --combined http.c
index 1ae19e070d,6182640c1e..d60f7f7679
--- a/http.c
+++ b/http.c
@@@ -719,7 -719,9 +719,9 @@@ void append_remote_object_url(struct st
  			      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);
  }
@@@ -1285,10 -1287,5 +1287,10 @@@ void release_http_object_request(struc
  		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;
 +	}
  }