git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Kirill A. Korinskiy" <catap@catap.ru>
To: gitster@pobox.com
Cc: git@vger.kernel.org, "Kirill A. Korinskiy" <catap@catap.ru>
Subject: [PATCH] http-push.c: DAV must support olny http and https scheme
Date: Mon, 13 Apr 2009 16:42:34 +0400	[thread overview]
Message-ID: <1239626554-26206-1-git-send-email-catap@catap.ru> (raw)

If the response from remote web-server have scp or other not http-like
scheme http-push can't go to change url, because DAV must work only
over HTTP (http and https scheme).

Signed-off-by: Kirill A. Korinskiy <catap@catap.ru>
---
 http-push.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/http-push.c b/http-push.c
index 5138224..79c8201 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1486,16 +1486,23 @@ static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed)
 			}
 		} else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) {
 			char *path = ctx->cdata;
-			if (*ctx->cdata == 'h') {
-				path = strstr(path, "//");
-				if (path) {
-					path = strchr(path+2, '/');
-				}
+
+			if (!strncasecmp(ctx->cdata, "http://", sizeof("http://") - 1)) {
+				path = strchr(path + sizeof("http://") - 1, '/');
+			} else if (!strncasecmp(ctx->cdata, "https://",
+						sizeof("https://") - 1)) {
+				path = strchr(path + sizeof("https://") - 1, '/');
+			} else if (strstr(path, "://")) {
+				path = NULL;
 			}
+
 			if (path) {
 				path += repo->path_len;
 				ls->dentry_name = xstrdup(path);
+			} else {
+				fprintf(stderr, "Not valid URI: %s\n", ctx->cdata);
 			}
+
 		} else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) {
 			ls->dentry_flags |= IS_DIR;
 		}
-- 
1.6.2

             reply	other threads:[~2009-04-13 12:49 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-13 12:42 Kirill A. Korinskiy [this message]
2009-04-13 17:00 ` [PATCH] http-push.c: DAV must support only http and https scheme Kirill A. Korinskiy
  -- strict thread matches above, loose matches on Subject: below --
2009-04-10 13:44 [PATCH] http-push.c: DAV must support olny " Kirill A. Korinskiy
2009-04-12  8:48 ` Junio C Hamano
2009-04-12  9:00   ` Mike Hommey
2009-04-12 18:45     ` Junio C Hamano
2009-04-12 18:49   ` Kirill A. Korinskiy
2009-04-12 19:33     ` Junio C Hamano
2009-04-13 16:44     ` Matthieu Moy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1239626554-26206-1-git-send-email-catap@catap.ru \
    --to=catap@catap.ru \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).