From: Josh Steadmon <steadmon@google.com>
To: git@vger.kernel.org
Cc: jrnieder@gmail.com, gitster@pobox.com, l.s.r@web.de,
sandals@crustytoothpaste.net, Josh Steadmon <steadmon@google.com>
Subject: [PATCH 3/3] archive: allow archive over HTTP(S) with proto v2
Date: Tue, 11 Sep 2018 22:35:19 -0700 [thread overview]
Message-ID: <20180912053519.31085-4-steadmon@google.com> (raw)
In-Reply-To: <20180912053519.31085-1-steadmon@google.com>
Signed-off-by: Josh Steadmon <steadmon@google.com>
---
builtin/archive.c | 8 +++++++-
http-backend.c | 10 +++++++++-
transport-helper.c | 5 +++--
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/builtin/archive.c b/builtin/archive.c
index 73831887d..5fa75b3f7 100644
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -87,7 +87,13 @@ static int run_remote_archiver(int argc, const char **argv,
status = packet_reader_read(&reader);
if (status != PACKET_READ_FLUSH)
die(_("git archive: expected a flush"));
- }
+ } else if (version == protocol_v2 &&
+ starts_with(transport->url, "http"))
+ /*
+ * Commands over HTTP require two requests, so there's an
+ * additional server response to parse.
+ */
+ discover_version(&reader);
/* Now, start reading from fd[0] and spit it out to stdout */
rv = recv_sideband("archive", fd[0], 1);
diff --git a/http-backend.c b/http-backend.c
index 458642ef7..d62d583c7 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -32,6 +32,7 @@ struct rpc_service {
static struct rpc_service rpc_service[] = {
{ "upload-pack", "uploadpack", 1, 1 },
{ "receive-pack", "receivepack", 0, -1 },
+ { "upload-archive", "uploadarchive", 1, 1 },
};
static struct string_list *get_parameters(void)
@@ -637,6 +638,12 @@ static void service_rpc(struct strbuf *hdr, char *service_name)
struct rpc_service *svc = select_service(hdr, service_name);
struct strbuf buf = STRBUF_INIT;
+ if (!strcmp(service_name, "git-upload-archive")) {
+ /* git-upload-archive doesn't need --stateless-rpc */
+ argv[1] = ".";
+ argv[2] = NULL;
+ }
+
strbuf_reset(&buf);
strbuf_addf(&buf, "application/x-git-%s-request", svc->name);
check_content_type(hdr, buf.buf);
@@ -713,7 +720,8 @@ static struct service_cmd {
{"GET", "/objects/pack/pack-[0-9a-f]{40}\\.idx$", get_idx_file},
{"POST", "/git-upload-pack$", service_rpc},
- {"POST", "/git-receive-pack$", service_rpc}
+ {"POST", "/git-receive-pack$", service_rpc},
+ {"POST", "/git-upload-archive$", service_rpc},
};
static int bad_request(struct strbuf *hdr, const struct service_cmd *c)
diff --git a/transport-helper.c b/transport-helper.c
index 143ca008c..b4b96fc89 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -605,7 +605,8 @@ static int process_connect_service(struct transport *transport,
ret = run_connect(transport, &cmdbuf);
} else if (data->stateless_connect &&
(get_protocol_version_config() == protocol_v2) &&
- !strcmp("git-upload-pack", name)) {
+ (!strcmp("git-upload-pack", name) ||
+ !strcmp("git-upload-archive", name))) {
strbuf_addf(&cmdbuf, "stateless-connect %s\n", name);
ret = run_connect(transport, &cmdbuf);
if (ret)
@@ -639,7 +640,7 @@ static int connect_helper(struct transport *transport, const char *name,
/* Get_helper so connect is inited. */
get_helper(transport);
- if (!data->connect)
+ if (!data->connect && !data->stateless_connect)
die(_("operation not supported by protocol"));
if (!process_connect_service(transport, name, exec))
--
2.19.0.397.gdd90340f6a-goog
next prev parent reply other threads:[~2018-09-12 5:36 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 5:35 Add proto v2 archive command with HTTP support Josh Steadmon
2018-09-12 5:35 ` [PATCH 1/3] archive: use packet_reader for communications Josh Steadmon
2018-09-12 22:01 ` Stefan Beller
2018-09-13 14:58 ` Junio C Hamano
2018-09-13 15:34 ` Junio C Hamano
2018-09-12 5:35 ` [PATCH 2/3] archive: implement protocol v2 archive command Josh Steadmon
2018-09-12 22:28 ` Stefan Beller
2018-09-13 18:45 ` Ævar Arnfjörð Bjarmason
2018-09-14 6:05 ` Jonathan Nieder
2018-09-14 14:31 ` Ævar Arnfjörð Bjarmason
2018-09-14 16:14 ` Junio C Hamano
2018-09-14 16:19 ` Jonathan Nieder
2018-09-13 16:31 ` Junio C Hamano
2018-09-14 5:39 ` Jonathan Nieder
2018-09-12 5:35 ` Josh Steadmon [this message]
2018-09-12 22:38 ` [PATCH 3/3] archive: allow archive over HTTP(S) with proto v2 Stefan Beller
2018-09-13 16:47 ` Junio C Hamano
2018-09-27 20:28 ` Josh Steadmon
2018-09-14 5:57 ` Jonathan Nieder
2018-09-14 5:36 ` Add proto v2 archive command with HTTP support Jonathan Nieder
2018-09-27 1:24 ` [PATCH v2 0/4] " Josh Steadmon
2018-09-27 1:24 ` [PATCH v2 1/4] archive: follow test standards around assertions Josh Steadmon
2018-09-27 18:38 ` Stefan Beller
2018-09-27 1:24 ` [PATCH v2 2/4] archive: use packet_reader for communications Josh Steadmon
2018-09-27 18:42 ` Stefan Beller
2018-09-27 1:24 ` [PATCH v2 3/4] archive: implement protocol v2 archive command Josh Steadmon
2018-09-27 1:24 ` [PATCH v2 4/4] archive: allow archive over HTTP(S) with proto v2 Josh Steadmon
2018-09-27 18:20 ` [PATCH v2 0/4] Add proto v2 archive command with HTTP support Stefan Beller
2018-09-27 18:30 ` Jonathan Nieder
2018-09-27 22:20 ` Junio C Hamano
2018-09-27 22:33 ` Josh Steadmon
2018-09-28 1:25 ` Junio C Hamano
2018-09-27 18:30 ` Josh Steadmon
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180912053519.31085-4-steadmon@google.com \
--to=steadmon@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=l.s.r@web.de \
--cc=sandals@crustytoothpaste.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).