Merge branch 'jk/maint-http-half-auth-fetch'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2012 19:59:29 +0000 (11:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2012 19:59:29 +0000 (11:59 -0800)
Finishing touches to squelch a compiler warning.

* jk/maint-http-half-auth-fetch:
remote-curl.c: Fix a compiler warning

1  2 
remote-curl.c
diff --combined remote-curl.c
index d8b3600bdd0b96e364775113c63957a2936a3324,5b1bb1991d004ad9acf056b04a37af1cb9a18c87..9a8b12350712422e660f40fdf5ef9f191d37de99
@@@ -95,16 -95,15 +95,16 @@@ static struct discovery* discover_refs(
        struct strbuf buffer = STRBUF_INIT;
        struct discovery *last = last_discovery;
        char *refs_url;
 -      int http_ret, is_http = 0, proto_git_candidate = 1;
 +      int http_ret, maybe_smart = 0;
  
        if (last && !strcmp(service, last->service))
                return last;
        free_discovery(last);
  
        strbuf_addf(&buffer, "%sinfo/refs", url);
 -      if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) {
 -              is_http = 1;
 +      if ((!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) &&
 +           git_env_bool("GIT_SMART_HTTP", 1)) {
 +              maybe_smart = 1;
                if (!strchr(url, '?'))
                        strbuf_addch(&buffer, '?');
                else
        refs_url = strbuf_detach(&buffer, NULL);
  
        http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
 -
 -      /* try again with "plain" url (no ? or & appended) */
 -      if (http_ret != HTTP_OK && http_ret != HTTP_NOAUTH) {
 -              free(refs_url);
 -              strbuf_reset(&buffer);
 -
 -              proto_git_candidate = 0;
 -              strbuf_addf(&buffer, "%sinfo/refs", url);
 -              refs_url = strbuf_detach(&buffer, NULL);
 -
 -              http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
 -      }
 -
        switch (http_ret) {
        case HTTP_OK:
                break;
        last->buf_alloc = strbuf_detach(&buffer, &last->len);
        last->buf = last->buf_alloc;
  
 -      if (is_http && proto_git_candidate
 -              && 5 <= last->len && last->buf[4] == '#') {
 +      if (maybe_smart && 5 <= last->len && last->buf[4] == '#') {
                /* smart HTTP response; validate that the service
                 * pkt-line matches our request.
                 */
@@@ -380,7 -393,7 +380,7 @@@ static int probe_rpc(struct rpc_state *
        curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
        curl_easy_setopt(slot->curl, CURLOPT_POST, 1);
        curl_easy_setopt(slot->curl, CURLOPT_URL, rpc->service_url);
 -      curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
 +      curl_easy_setopt(slot->curl, CURLOPT_ENCODING, NULL);
        curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, "0000");
        curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, 4);
        curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
@@@ -400,7 -413,7 +400,7 @@@ static int post_rpc(struct rpc_state *r
        struct curl_slist *headers = NULL;
        int use_gzip = rpc->gzip_request;
        char *gzip_body = NULL;
-       size_t gzip_size;
+       size_t gzip_size = 0;
        int err, large_request = 0;
  
        /* Try to load the entire request, if we can fit it into the
@@@ -442,7 -455,7 +442,7 @@@ retry
        curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
        curl_easy_setopt(slot->curl, CURLOPT_POST, 1);
        curl_easy_setopt(slot->curl, CURLOPT_URL, rpc->service_url);
 -      curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
 +      curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "gzip");
  
        if (large_request) {
                /* The request body is large and the size cannot be predicted.