Merge branch 'jk/url-decode'

* jk/url-decode:
  url_decode: URL scheme ends with a colon and does not require a slash
This commit is contained in:
Junio C Hamano
2010-06-30 11:55:38 -07:00

8
url.c
View File

@ -103,12 +103,12 @@ static char *url_decode_internal(const char **query, const char *stop_at, struct
char *url_decode(const char *url) char *url_decode(const char *url)
{ {
struct strbuf out = STRBUF_INIT; struct strbuf out = STRBUF_INIT;
const char *slash = strchr(url, '/'); const char *colon = strchr(url, ':');
/* Skip protocol part if present */ /* Skip protocol part if present */
if (slash && url < slash) { if (colon && url < colon) {
strbuf_add(&out, url, slash - url); strbuf_add(&out, url, colon - url);
url = slash; url = colon;
} }
return url_decode_internal(&url, NULL, &out); return url_decode_internal(&url, NULL, &out);
} }