[PATCH] enable "no-done" extension only when serving over smart-http
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 29, 2011, 17:32 UTC
- Message-ID
- <7vfwq5suhp.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <7vlizxsv82.fsf@alter.siamese.dyndns.org>
Do not advertise no-done capability when upload-pack is not serving over smart-http, as there is no way for this server to know when it should stop reading in-flight data from the client, even though it is necessary to drain all the in-flight data in order to unblock the client.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- * Sorry for the resend...
upload-pack.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c index 5924f6f..a247fb9 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -640,15 +640,16 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo { static const char *capabilities = "multi_ack thin-pack side-band" " side-band-64k ofs-delta shallow no-progress" - " include-tag multi_ack_detailed no-done"; + " include-tag multi_ack_detailed"; struct object *o = parse_object(sha1); if (!o) die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1)); if (capabilities) - packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname, - 0, capabilities); + packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1), refname, + 0, capabilities, + stateless_rpc ? " no-done" : ""); else packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname); capabilities = NULL;