Merge branch 'bc/http-100-continue'
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2013 20:58:58 +0000 (12:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Dec 2013 20:58:59 +0000 (12:58 -0800)
Issue "100 Continue" responses to help use of GSS-Negotiate
authentication scheme over HTTP transport when needed.

* bc/http-100-continue:
remote-curl: fix large pushes with GSSAPI
remote-curl: pass curl slot_results back through run_slot
http: return curl's AUTHAVAIL via slot_results

1  2 
http.c
http.h
remote-curl.c
diff --cc http.c
Simple merge
diff --cc http.h
Simple merge
diff --cc remote-curl.c
index c9b891adbf134193f07681a631ae368671e04aa6,427d50f8dec6e94ed831683403aa435bcfe83080..91b07a41456fe5cdb2157a648353d982b88f7e9a
@@@ -472,10 -447,10 +477,12 @@@ static int post_rpc(struct rpc_state *r
        }
  
        if (large_request) {
+               struct slot_results results;
                do {
-                       err = probe_rpc(rpc);
+                       err = probe_rpc(rpc, &results);
 +                      if (err == HTTP_REAUTH)
 +                              credential_fill(&http_auth);
                } while (err == HTTP_REAUTH);
                if (err != HTTP_OK)
                        return -1;
@@@ -574,11 -553,9 +585,11 @@@ retry
        curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, rpc_in);
        curl_easy_setopt(slot->curl, CURLOPT_FILE, rpc);
  
-       err = run_slot(slot);
+       err = run_slot(slot, NULL);
 -      if (err == HTTP_REAUTH && !large_request)
 +      if (err == HTTP_REAUTH && !large_request) {
 +              credential_fill(&http_auth);
                goto retry;
 +      }
        if (err != HTTP_OK)
                err = -1;