Skip to content

Commit

Permalink
http-push: Normalise directory names when pushing to some WebDAV servers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tay Ray Chuan authored and Junio C Hamano committed Nov 26, 2010
1 parent cf688cc commit 0fdadc5
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions http-push.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 0fdadc5

Please sign in to comment.