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

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

diff --combined http.c
index 1ae19e070dfd138a6c6729d7725da65c41c186eb,6182640c1e8a6d2f1f259195cc73aa642e59efd2..d60f7f7679459fe5e5ce64daf7152bd83535b632
--- 1/http.c
--- 2/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;
 +      }
  }