From: Tay Ray Chuan Date: Thu, 25 Nov 2010 08:21:07 +0000 (+0800) Subject: http-push: Normalise directory names when pushing to some WebDAV servers X-Git-Tag: v1.7.3.4~10^2~3 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0fdadc501ee42c530946731718dfdd710f4005d3;p=git.git 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 Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano --- diff --git a/http-push.c b/http-push.c index c9bcd1169..565e580d5 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); }