diff options
| author | Jeff King <peff@peff.net> | 2012-10-31 11:20:15 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-31 11:45:08 (GMT) |
| commit | df126e108b899da133a980e900df39dfe57fcd59 (patch) | |
| tree | bd9b8267dd4a3122921554ac41359c18a1a86ee1 /remote-curl.c | |
| parent | 1960897ebc5a899a8e4ec3c2afc1d2325574fe41 (diff) | |
| download | git-df126e108b899da133a980e900df39dfe57fcd59.zip git-df126e108b899da133a980e900df39dfe57fcd59.tar.gz git-df126e108b899da133a980e900df39dfe57fcd59.tar.bz2 | |
remote-curl: hoist gzip buffer size to top of post_rpc
When we gzip the post data for a smart-http rpc request, we
compute the gzip body and its size inside the "use_gzip"
conditional. We keep track of the body after the conditional
ends, but not the size. Let's remember both, which will
enable us to retry failed gzip requests in a future patch.
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/remote-curl.c b/remote-curl.c index aefafd3..10cd47d 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -413,6 +413,7 @@ static int post_rpc(struct rpc_state *rpc) struct curl_slist *headers = NULL; int use_gzip = rpc->gzip_request; char *gzip_body = NULL; + size_t gzip_size; int err, large_request = 0; /* Try to load the entire request, if we can fit it into the @@ -478,19 +479,18 @@ retry: * we can try to deflate it ourselves, this may save on. * the transfer time. */ - size_t size; git_zstream stream; int ret; memset(&stream, 0, sizeof(stream)); git_deflate_init_gzip(&stream, Z_BEST_COMPRESSION); - size = git_deflate_bound(&stream, rpc->len); - gzip_body = xmalloc(size); + gzip_size = git_deflate_bound(&stream, rpc->len); + gzip_body = xmalloc(gzip_size); stream.next_in = (unsigned char *)rpc->buf; stream.avail_in = rpc->len; stream.next_out = (unsigned char *)gzip_body; - stream.avail_out = size; + stream.avail_out = gzip_size; ret = git_deflate(&stream, Z_FINISH); if (ret != Z_STREAM_END) @@ -500,16 +500,16 @@ retry: if (ret != Z_OK) die("cannot deflate request; zlib end error %d", ret); - size = stream.total_out; + gzip_size = stream.total_out; headers = curl_slist_append(headers, "Content-Encoding: gzip"); curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, gzip_body); - curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, size); + curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, gzip_size); if (options.verbosity > 1) { fprintf(stderr, "POST %s (gzip %lu to %lu bytes)\n", rpc->service_name, - (unsigned long)rpc->len, (unsigned long)size); + (unsigned long)rpc->len, (unsigned long)gzip_size); fflush(stderr); } } else { |