git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] remote-curl: ensure that URLs do not have a trailing slash
@ 2010-04-07 14:51 Tay Ray Chuan
  2010-04-07 15:12 ` Junio C Hamano
  0 siblings, 1 reply; 10+ messages in thread
From: Tay Ray Chuan @ 2010-04-07 14:51 UTC (permalink / raw)
  To: Git Mailing List; +Cc: Shawn O. Pearce, Junio C Hamano

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
 remote-curl.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/remote-curl.c b/remote-curl.c
index 0782756..0f21f8a 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -101,7 +101,8 @@ static struct discovery* discover_refs(const char *service)
 		return last;
 	free_discovery(last);
 
-	strbuf_addf(&buffer, "%s/info/refs", url);
+	end_url_with_slash(&buffer, url);
+	strbuf_addstr(&buffer, "info/refs");
 	if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) {
 		is_http = 1;
 		if (!strchr(url, '?'))
@@ -120,7 +121,8 @@ static struct discovery* discover_refs(const char *service)
 		strbuf_reset(&buffer);
 
 		proto_git_candidate = 0;
-		strbuf_addf(&buffer, "%s/info/refs", url);
+		end_url_with_slash(&buffer, url);
+		strbuf_addstr(&buffer, "info/refs");
 		refs_url = strbuf_detach(&buffer, NULL);
 
 		http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
@@ -511,7 +513,8 @@ 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);
+	end_url_with_slash(&buf, url)
+	strbuf_addf(&buf, "%s", svc);
 	rpc->service_url = strbuf_detach(&buf, NULL);
 
 	strbuf_addf(&buf, "Content-Type: application/x-%s-request", svc);
-- 
1.7.0.20.gcb44ed

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2010-04-08  2:15 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-07 14:51 [PATCH] remote-curl: ensure that URLs do not have a trailing slash Tay Ray Chuan
2010-04-07 15:12 ` Junio C Hamano
2010-04-07 15:57   ` Tay Ray Chuan
2010-04-07 15:58     ` [PATCH v2 1/2] http: make end_url_with_slash() public Tay Ray Chuan
2010-04-07 16:01     ` [PATCH v2 resend " Tay Ray Chuan
2010-04-07 16:01       ` [PATCH v2 resend 2/2] remote-curl: ensure that URLs have a trailing slash Tay Ray Chuan
2010-04-07 23:15         ` Junio C Hamano
2010-04-08  2:15         ` [PATCH v3 1/3] t5541-http-push: add test for URLs with " Tay Ray Chuan
2010-04-08  2:15           ` [PATCH v3 2/3] http: make end_url_with_slash() public Tay Ray Chuan
2010-04-08  2:15             ` [PATCH v3 3/3] remote-curl: ensure that URLs have a trailing slash Tay Ray Chuan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).