git p4: rearrange and simplify hasOrigin handling

diff --git a/remote-curl.c b/remote-curl.c
index 42716c59cfe419571d98a7f3b3674e94e2fe3618..9a8b12350712422e660f40fdf5ef9f191d37de99 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -356,7 +356,7 @@ static int run_slot(struct active_request_slot *slot)
        slot->curl_result = curl_easy_perform(slot->curl);
        finish_active_slot(slot);
 
-       err = handle_curl_result(slot, &results);
+       err = handle_curl_result(&results);
        if (err != HTTP_OK && err != HTTP_REAUTH) {
                error("RPC failed; result=%d, HTTP code = %ld",
                      results.curl_result, results.http_code);
@@ -400,6 +400,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 = 0;
        int err, large_request = 0;
 
        /* Try to load the entire request, if we can fit it into the
@@ -431,6 +432,11 @@ static int post_rpc(struct rpc_state *rpc)
                        return -1;
        }
 
+       headers = curl_slist_append(headers, rpc->hdr_content_type);
+       headers = curl_slist_append(headers, rpc->hdr_accept);
+       headers = curl_slist_append(headers, "Expect:");
+
+retry:
        slot = get_active_slot();
 
        curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
@@ -438,10 +444,6 @@ static int post_rpc(struct rpc_state *rpc)
        curl_easy_setopt(slot->curl, CURLOPT_URL, rpc->service_url);
        curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "gzip");
 
-       headers = curl_slist_append(headers, rpc->hdr_content_type);
-       headers = curl_slist_append(headers, rpc->hdr_accept);
-       headers = curl_slist_append(headers, "Expect:");
-
        if (large_request) {
                /* The request body is large and the size cannot be predicted.
                 * We must use chunked encoding to send it.
@@ -459,24 +461,32 @@ static int post_rpc(struct rpc_state *rpc)
                        fflush(stderr);
                }
 
+       } else if (gzip_body) {
+               /*
+                * If we are looping to retry authentication, then the previous
+                * run will have set up the headers and gzip buffer already,
+                * and we just need to send it.
+                */
+               curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, gzip_body);
+               curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, gzip_size);
+
        } else if (use_gzip && 1024 < rpc->len) {
                /* The client backend isn't giving us compressed data so
                 * 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)
@@ -486,16 +496,16 @@ static int post_rpc(struct rpc_state *rpc)
                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 {
@@ -515,9 +525,9 @@ static int post_rpc(struct rpc_state *rpc)
        curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, rpc_in);
        curl_easy_setopt(slot->curl, CURLOPT_FILE, rpc);
 
-       do {
-               err = run_slot(slot);
-       } while (err == HTTP_REAUTH && !large_request && !use_gzip);
+       err = run_slot(slot);
+       if (err == HTTP_REAUTH && !large_request)
+               goto retry;
        if (err != HTTP_OK)
                err = -1;