Merge branch 'cn/thin-push-capability'

[~andy/git] / http.h

diff --git a/http.h b/http.h
index 974ede7736ec746c9ef067dd747c407db8df8c98..cd37d5881cb0e63e52bd33d0b49bed49645340f5 100644 (file)
--- a/http.h
+++ b/http.h
@@ -54,6 +54,7 @@
 struct slot_results {
        CURLcode curl_result;
        long http_code;
+       long auth_avail;
 };
 
 struct active_request_slot {
@@ -139,6 +140,14 @@ struct http_get_options {
         * redirects we followed.
         */
        struct strbuf *effective_url;
+
+       /*
+        * If both base_url and effective_url are non-NULL, the base URL will
+        * be munged to reflect any redirections going from the requested url
+        * to effective_url. See the definition of update_url_from_redirect
+        * for details.
+        */
+       struct strbuf *base_url;
 };
 
 /* Return values for http_get_*() */