[PATCH] http-push and http-fetch: handle URLs without leading /
From: Grégoire Barbier <hidden>
Date: 2016-06-15 22:44:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
Since HTTP/302 is not handled in the git code calling curl, URLs without leading / used to lead to frozen git-fetch or git-push with no error message. Furthermore, http-push freeze forces the user to interrupt it (^C) and therefore to leave a dandling webdav lock that makes the remote repository un-pushable for 10 minutes. The patch does not make curl calls handle HTTP/302 but instead adds a / at the end of URLs that does not have it yet. --- builtin-http-fetch.c | 10 ++++++++++ http-push.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/builtin-http-fetch.c b/builtin-http-fetch.c
index 4a50dbd..3c1ed08 100644
--- a/builtin-http-fetch.c
+++ b/builtin-http-fetch.c@@ -9,6 +9,7 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix) const char **write_ref = NULL; char **commit_id; const char *url; + char *rewritten_url = NULL; int arg = 1; int rc = 0; int get_tree = 0;
@@ -51,6 +52,12 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix) commits = 1; } 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_tree = get_tree;
@@ -73,5 +80,8 @@ int cmd_http_fetch(int argc, const char **argv, const char *prefix) walker_free(walker); + if (rewritten_url) + free(rewritten_url); + return rc; }
diff --git a/http-push.c b/http-push.c
index c984d84..2c27105 100644
--- a/http-push.c
+++ b/http-push.c@@ -2161,6 +2161,7 @@ int main(int argc, char **argv) int i; int new_refs; struct ref *ref; + char *rewritten_url = NULL; setup_git_directory();
@@ -2228,6 +2229,14 @@ int main(int argc, char **argv) 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; + } + if (!http_test_connection(remote->url)) { fprintf(stderr, "Error: cannot access to remote URL (maybe malformed URL, network error or bad credentials)\n"); rc = 1;
@@ -2415,6 +2424,8 @@ int main(int argc, char **argv) } cleanup: + if (rewritten_url) + free(rewritten_url); if (info_ref_lock) unlock_remote(info_ref_lock); free(remote);
--
1.5.4.rc3.52.g9a5bd-dirty