diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-16 23:19:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-16 23:19:43 (GMT) |
| commit | 4dd4a09eac9ecb27f051ad0f3447c205c5b50c8b (patch) | |
| tree | 56699c1cae789f492ec4222839415c612d13654e /remote-curl.c | |
| parent | 755f0e36bcaaeb1c95726faaccb10da800803570 (diff) | |
| parent | d8fab07208abfbe7dc93aea97c5577cdd73266c5 (diff) | |
| download | git-4dd4a09eac9ecb27f051ad0f3447c205c5b50c8b.zip git-4dd4a09eac9ecb27f051ad0f3447c205c5b50c8b.tar.gz git-4dd4a09eac9ecb27f051ad0f3447c205c5b50c8b.tar.bz2 | |
Merge branch 'rc/maint-curl-helper' into maint
* rc/maint-curl-helper:
remote-curl: ensure that URLs have a trailing slash
http: make end_url_with_slash() public
t5541-http-push: add test for URLs with trailing slash
Conflicts:
remote-curl.c
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/remote-curl.c b/remote-curl.c index b76bfcb..9c7fcf2 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -9,7 +9,7 @@ #include "sideband.h" static struct remote *remote; -static const char *url; +static const char *url; /* always ends with a trailing slash */ struct options { int verbosity; @@ -101,7 +101,7 @@ static struct discovery* discover_refs(const char *service) return last; free_discovery(last); - strbuf_addf(&buffer, "%s/info/refs", url); + strbuf_addf(&buffer, "%sinfo/refs", url); if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) { is_http = 1; if (!strchr(url, '?')) @@ -120,7 +120,7 @@ static struct discovery* discover_refs(const char *service) strbuf_reset(&buffer); proto_git_candidate = 0; - strbuf_addf(&buffer, "%s/info/refs", url); + strbuf_addf(&buffer, "%sinfo/refs", url); refs_url = strbuf_detach(&buffer, NULL); http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); @@ -509,7 +509,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads) rpc->out = client.out; strbuf_init(&rpc->result, 0); - strbuf_addf(&buf, "%s/%s", url, svc); + strbuf_addf(&buf, "%s%s", url, svc); rpc->service_url = strbuf_detach(&buf, NULL); strbuf_addf(&buf, "Content-Type: application/x-%s-request", svc); @@ -798,11 +798,13 @@ int main(int argc, const char **argv) remote = remote_get(argv[1]); if (argc > 2) { - url = argv[2]; + end_url_with_slash(&buf, argv[2]); } else { - url = remote->url[0]; + end_url_with_slash(&buf, remote->url[0]); } + url = strbuf_detach(&buf, NULL); + http_init(remote); do { |