diff options
| author | Brian M. Carlson <sandals@crustytoothpaste.net> | 2013-10-31 02:36:51 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-31 10:13:40 -0700 |
| commit | c80d96ca0c3cf948c5062bf6591a46c625620b6d (patch) | |
| tree | f37dbe101264374be04dc169a1c86a7143177f56 /remote-curl.c | |
| parent | 3a347ed70727cdcb447040705b4128304c0244e3 (diff) | |
| download | git-c80d96ca0c3cf948c5062bf6591a46c625620b6d.tar.gz | |
remote-curl: fix large pushes with GSSAPIbc/http-100-continue
Due to an interaction between the way libcurl handles GSSAPI
authentication over HTTP and the way git uses libcurl, large
pushes (those over http.postBuffer bytes) would fail due to
an authentication failure requiring a rewind of the curl
buffer. Such a rewind was not possible because the data did
not fit into the entire buffer.
Enable the use of the Expect: 100-continue header for large
requests where the server offers GSSAPI authentication to
avoid this issue, since the request would otherwise fail.
This allows git to get the authentication data right before
sending the pack contents. Existing cases where pushes
would succeed, including small requests using GSSAPI, still
disable the use of 100 Continue, as it causes problems for
some remote HTTP implementations (servers and proxies).
Signed-off-by: Brian M. Carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/remote-curl.c b/remote-curl.c index 9ad347159e..427d50f8de 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -423,6 +423,7 @@ static int post_rpc(struct rpc_state *rpc) char *gzip_body = NULL; size_t gzip_size = 0; int err, large_request = 0; + int needs_100_continue = 0; /* Try to load the entire request, if we can fit it into the * allocated buffer space we can use HTTP/1.0 and avoid the @@ -446,16 +447,22 @@ static int post_rpc(struct rpc_state *rpc) } if (large_request) { + struct slot_results results; + do { - err = probe_rpc(rpc, NULL); + err = probe_rpc(rpc, &results); } while (err == HTTP_REAUTH); if (err != HTTP_OK) return -1; + + if (results.auth_avail & CURLAUTH_GSSNEGOTIATE) + needs_100_continue = 1; } headers = curl_slist_append(headers, rpc->hdr_content_type); headers = curl_slist_append(headers, rpc->hdr_accept); - headers = curl_slist_append(headers, "Expect:"); + headers = curl_slist_append(headers, needs_100_continue ? + "Expect: 100-continue" : "Expect:"); retry: slot = get_active_slot(); |