summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorTay Ray Chuan <rctay89@gmail.com>2010-11-25 08:21:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-26 22:50:45 (GMT)
commit0fdadc501ee42c530946731718dfdd710f4005d3 (patch)
tree698ee83bf813f6765c9e57452cab53b0263c7a02 /http-push.c
parentcf688cc27329c478eb9ec9be56144198e4a2025a (diff)
downloadgit-0fdadc501ee42c530946731718dfdd710f4005d3.zip
git-0fdadc501ee42c530946731718dfdd710f4005d3.tar.gz
git-0fdadc501ee42c530946731718dfdd710f4005d3.tar.bz2
http-push: Normalise directory names when pushing to some WebDAV servers
Fix a bug when pushing to WebDAV servers which do not use a trailing slash for collection names. The previous implementation fails to see that the requested resource "refs/" is the same resource as "refs" and loads every reference twice (once for refs/ and once for refs). This implementation normalises every collection name by appending a trailing slash if necessary. This can be tested with old versions of Apache (such as the WebDAV server of GMX, Apache 2.0.63). Based-on-patch-by: Gabriel Corona <gabriel.corona@enst-bretagne.fr> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-push.c')
-rw-r--r--http-push.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/http-push.c b/http-push.c
index c9bcd11..565e580 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1090,6 +1090,10 @@ static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed)
if (tag_closed) {
if (!strcmp(ctx->name, DAV_PROPFIND_RESP) && ls->dentry_name) {
if (ls->dentry_flags & IS_DIR) {
+
+ /* ensure collection names end with slash */
+ str_end_url_with_slash(ls->dentry_name, &ls->dentry_name);
+
if (ls->flags & PROCESS_DIRS) {
ls->userFunc(ls);
}