undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http-push and http-fetch: handle URLs without trailing /

Browse Source 
The URL to a repository http-push and http-fetch takes should
have a trailing slash.  Instead of failing the request, add it
ourselves before attempting such a request.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Grégoire Barbier 2008-01-19 16:22:50 +01:00 committed by Junio C Hamano
parent 325ce3959c
commit 3057ded057
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-http-fetch.c
View File

@ -9,6 +9,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)
const char **write_ref = NULL; const char **write_ref = NULL;
char **commit_id; char **commit_id;
const char *url; const char *url;
char *rewritten_url = NULL;
int arg = 1; int arg = 1;
int rc = 0; int rc = 0;
int get_tree = 0; int get_tree = 0;
@ -51,6 +52,12 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)
commits = 1; commits = 1;
} }
url = argv[arg]; url = argv[arg];
if (url && url[strlen(url)-1] != '/') {
rewritten_url = malloc(strlen(url)+2);
strcpy(rewritten_url, url);
strcat(rewritten_url, "/");
url = rewritten_url;
}
walker = get_http_walker(url); walker = get_http_walker(url);
walker->get_tree = get_tree; walker->get_tree = get_tree;
@ -73,5 +80,8 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix)
walker_free(walker); walker_free(walker);
if (rewritten_url)
free(rewritten_url);
return rc; return rc;
} }

11
http-push.c
View File

@ -2169,6 +2169,7 @@ int main(int argc, char **argv)
int i; int i;
int new_refs; int new_refs;
struct ref *ref; struct ref *ref;
char *rewritten_url = NULL;
setup_git_directory(); setup_git_directory();
@ -2236,6 +2237,14 @@ int main(int argc, char **argv)
no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:"); no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
if (remote->url && remote->url[strlen(remote->url)-1] != '/') {
rewritten_url = malloc(strlen(remote->url)+2);
strcpy(rewritten_url, remote->url);
strcat(rewritten_url, "/");
remote->url = rewritten_url;
++remote->path_len;
}
/* Verify DAV compliance/lock support */ /* Verify DAV compliance/lock support */
if (!locking_available()) { if (!locking_available()) {
rc = 1; rc = 1;
@ -2416,6 +2425,8 @@ int main(int argc, char **argv)
} }
cleanup: cleanup:
if (rewritten_url)
free(rewritten_url);
if (info_ref_lock) if (info_ref_lock)
unlock_remote(info_ref_lock); unlock_remote(info_ref_lock);
free(remote); free(remote);