|
|
|
|
#ifndef HTTP_H
|
|
|
|
|
#define HTTP_H
|
|
|
|
|
|
|
|
|
|
#include "cache.h"
|
|
|
|
|
|
|
|
|
|
#include <curl/curl.h>
|
|
|
|
|
#include <curl/easy.h>
|
|
|
|
|
|
|
|
|
|
#include "strbuf.h"
|
|
|
|
|
#include "remote.h"
|
|
|
|
|
#include "url.h"
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We detect based on the cURL version if multi-transfer is
|
|
|
|
|
* usable in this implementation and define this symbol accordingly.
|
|
|
|
|
* This is not something Makefile should set nor users should pass
|
|
|
|
|
* via CFLAGS.
|
|
|
|
|
*/
|
|
|
|
|
#undef USE_CURL_MULTI
|
|
|
|
|
|
|
|
|
|
#if LIBCURL_VERSION_NUM >= 0x071000
|
|
|
|
|
#define USE_CURL_MULTI
|
|
|
|
|
#define DEFAULT_MAX_REQUESTS 5
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if LIBCURL_VERSION_NUM < 0x070704
|
|
|
|
|
#define curl_global_cleanup() do { /* nothing */ } while (0)
|
|
|
|
|
#endif
|
|
|
|
|
#if LIBCURL_VERSION_NUM < 0x070800
|
|
|
|
|
#define curl_global_init(a) do { /* nothing */ } while (0)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if (LIBCURL_VERSION_NUM < 0x070c04) || (LIBCURL_VERSION_NUM == 0x071000)
|
|
|
|
|
#define NO_CURL_EASY_DUPHANDLE
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if LIBCURL_VERSION_NUM < 0x070a03
|
|
|
|
|
#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if LIBCURL_VERSION_NUM < 0x070c03
|
|
|
|
|
#define NO_CURL_IOCTL
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
struct slot_results {
|
|
|
|
|
CURLcode curl_result;
|
|
|
|
|
long http_code;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct active_request_slot {
|
|
|
|
|
CURL *curl;
|
|
|
|
|
FILE *local;
|
|
|
|
|
int in_use;
|
|
|
|
|
CURLcode curl_result;
|
|
|
|
|
long http_code;
|
|
|
|
|
int *finished;
|
|
|
|
|
struct slot_results *results;
|
|
|
|
|
void *callback_data;
|
|
|
|
|
void (*callback_func)(void *data);
|
|
|
|
|
struct active_request_slot *next;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct buffer {
|
|
|
|
|
struct strbuf buf;
|
|
|
|
|
size_t posn;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Curl request read/write callbacks */
|
|
|
|
|
extern size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
|
|
|
|
|
extern size_t fwrite_buffer(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
|
|
|
|
|
extern size_t fwrite_null(char *ptr, size_t eltsize, size_t nmemb, void *strbuf);
|
|
|
|
|
#ifndef NO_CURL_IOCTL
|
|
|
|
|
extern curlioerr ioctl_buffer(CURL *handle, int cmd, void *clientp);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Slot lifecycle functions */
|
|
|
|
|
extern struct active_request_slot *get_active_slot(void);
|
|
|
|
|
extern int start_active_slot(struct active_request_slot *slot);
|
|
|
|
|
extern void run_active_slot(struct active_request_slot *slot);
|
|
|
|
|
extern void finish_active_slot(struct active_request_slot *slot);
|
|
|
|
|
extern void finish_all_active_slots(void);
|
|
|
|
|
|
|
|
|
|
#ifdef USE_CURL_MULTI
|
|
|
|
|
extern void fill_active_slots(void);
|
|
|
|
|
extern void add_fill_function(void *data, int (*fill)(void *));
|
|
|
|
|
extern void step_active_slots(void);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
extern void http_init(struct remote *remote);
|
|
|
|
|
extern void http_cleanup(void);
|
|
|
|
|
|
|
|
|
|
extern int data_received;
|
|
|
|
|
extern int active_requests;
|
|
|
|
|
extern int http_is_verbose;
|
|
|
|
|
extern size_t http_post_buffer;
|
|
|
|
|
|
|
|
|
|
extern char curl_errorstr[CURL_ERROR_SIZE];
|
|
|
|
|
|
|
|
|
|
static inline int missing__target(int code, int result)
|
|
|
|
|
{
|
|
|
|
|
return /* file:// URL -- do we ever use one??? */
|
|
|
|
|
(result == CURLE_FILE_COULDNT_READ_FILE) ||
|
|
|
|
|
/* http:// and https:// URL */
|
|
|
|
|
(code == 404 && result == CURLE_HTTP_RETURNED_ERROR) ||
|
|
|
|
|
/* ftp:// URL */
|
|
|
|
|
(code == 550 && result == CURLE_FTP_COULDNT_RETR_FILE)
|
|
|
|
|
;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define missing_target(a) missing__target((a)->http_code, (a)->curl_result)
|
|
|
|
|
|
http*: add helper methods for fetching objects (loose)
The code handling the fetching of loose objects in http-push.c and
http-walker.c have been refactored into new methods and a new struct
(object_http_request) in http.c. They are not meant to be invoked
elsewhere.
The new methods in http.c are
- new_http_object_request
- process_http_object_request
- finish_http_object_request
- abort_http_object_request
- release_http_object_request
and the new struct is http_object_request.
RANGER_HEADER_SIZE and no_pragma_header is no longer made available
outside of http.c, since after the above changes, there are no other
instances of usage outside of http.c.
Remove members of the transfer_request struct in http-push.c and
http-walker.c, including filename, real_sha1 and zret, as they are used
no longer used.
Move the methods append_remote_object_url() and get_remote_object_url()
from http-push.c to http.c. Additionally, get_remote_object_url() is no
longer defined only when USE_CURL_MULTI is defined, since
non-USE_CURL_MULTI code in http.c uses it (namely, in
new_http_object_request()).
Refactor code from http-push.c::start_fetch_loose() and
http-walker.c::start_object_fetch_request() that deals with the details
of coming up with the filename to store the retrieved object, resuming
a previously aborted request, and making a new curl request, into a new
function, new_http_object_request().
Refactor code from http-walker.c::process_object_request() into the
function, process_http_object_request().
Refactor code from http-push.c::finish_request() and
http-walker.c::finish_object_request() into a new function,
finish_http_object_request(). It returns the result of the
move_temp_to_file() invocation.
Add a function, release_http_object_request(), which cleans up object
request data. http-push.c and http-walker.c invoke this function
separately; http-push.c::release_request() and
http-walker.c::release_object_request() do not invoke this function.
Add a function, abort_http_object_request(), which unlink()s the object
file and invokes release_http_object_request(). Update
http-walker.c::abort_object_request() to use this.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years ago
|
|
|
/* Helpers for modifying and creating URLs */
|
|
|
|
|
extern void append_remote_object_url(struct strbuf *buf, const char *url,
|
|
|
|
|
const char *hex,
|
|
|
|
|
int only_two_digit_prefix);
|
|
|
|
|
extern char *get_remote_object_url(const char *url, const char *hex,
|
|
|
|
|
int only_two_digit_prefix);
|
|
|
|
|
|
|
|
|
|
/* Options for http_request_*() */
|
|
|
|
|
#define HTTP_NO_CACHE 1
|
|
|
|
|
|
|
|
|
|
/* Return values for http_request_*() */
|
|
|
|
|
#define HTTP_OK 0
|
|
|
|
|
#define HTTP_MISSING_TARGET 1
|
|
|
|
|
#define HTTP_ERROR 2
|
|
|
|
|
#define HTTP_START_FAILED 3
|
|
|
|
|
#define HTTP_REAUTH 4
|
|
|
|
|
#define HTTP_NOAUTH 5
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Requests an url and stores the result in a strbuf.
|
|
|
|
|
*
|
|
|
|
|
* If the result pointer is NULL, a HTTP HEAD request is made instead of GET.
|
|
|
|
|
*/
|
|
|
|
|
int http_get_strbuf(const char *url, struct strbuf *result, int options);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Prints an error message using error() containing url and curl_errorstr,
|
|
|
|
|
* and returns ret.
|
|
|
|
|
*/
|
|
|
|
|
int http_error(const char *url, int ret);
|
|
|
|
|
|
Make walker.fetch_ref() take a struct ref.
This simplifies a few things, makes a few things slightly more
complicated, but, more importantly, allows that, when struct ref can
represent a symref, http_fetch_ref() can return one.
Incidentally makes the string that http_fetch_ref() gets include "refs/"
(if appropriate), because that's how the name field of struct ref works.
As far as I can tell, the usage in walker:interpret_target() wouldn't have
worked previously, if it ever would have been used, which it wouldn't
(since the fetch process uses the hash instead of the name of the ref
there).
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 years ago
|
|
|
extern int http_fetch_ref(const char *base, struct ref *ref);
|
|
|
|
|
|
|
|
|
|
/* Helpers for fetching packs */
|
|
|
|
|
extern int http_get_info_packs(const char *base_url,
|
|
|
|
|
struct packed_git **packs_head);
|
|
|
|
|
|
|
|
|
|
struct http_pack_request {
|
|
|
|
|
char *url;
|
|
|
|
|
struct packed_git *target;
|
|
|
|
|
struct packed_git **lst;
|
|
|
|
|
FILE *packfile;
|
|
|
|
|
char tmpfile[PATH_MAX];
|
|
|
|
|
struct curl_slist *range_header;
|
|
|
|
|
struct active_request_slot *slot;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern struct http_pack_request *new_http_pack_request(
|
|
|
|
|
struct packed_git *target, const char *base_url);
|
|
|
|
|
extern int finish_http_pack_request(struct http_pack_request *preq);
|
|
|
|
|
extern void release_http_pack_request(struct http_pack_request *preq);
|
|
|
|
|
|
http*: add helper methods for fetching objects (loose)
The code handling the fetching of loose objects in http-push.c and
http-walker.c have been refactored into new methods and a new struct
(object_http_request) in http.c. They are not meant to be invoked
elsewhere.
The new methods in http.c are
- new_http_object_request
- process_http_object_request
- finish_http_object_request
- abort_http_object_request
- release_http_object_request
and the new struct is http_object_request.
RANGER_HEADER_SIZE and no_pragma_header is no longer made available
outside of http.c, since after the above changes, there are no other
instances of usage outside of http.c.
Remove members of the transfer_request struct in http-push.c and
http-walker.c, including filename, real_sha1 and zret, as they are used
no longer used.
Move the methods append_remote_object_url() and get_remote_object_url()
from http-push.c to http.c. Additionally, get_remote_object_url() is no
longer defined only when USE_CURL_MULTI is defined, since
non-USE_CURL_MULTI code in http.c uses it (namely, in
new_http_object_request()).
Refactor code from http-push.c::start_fetch_loose() and
http-walker.c::start_object_fetch_request() that deals with the details
of coming up with the filename to store the retrieved object, resuming
a previously aborted request, and making a new curl request, into a new
function, new_http_object_request().
Refactor code from http-walker.c::process_object_request() into the
function, process_http_object_request().
Refactor code from http-push.c::finish_request() and
http-walker.c::finish_object_request() into a new function,
finish_http_object_request(). It returns the result of the
move_temp_to_file() invocation.
Add a function, release_http_object_request(), which cleans up object
request data. http-push.c and http-walker.c invoke this function
separately; http-push.c::release_request() and
http-walker.c::release_object_request() do not invoke this function.
Add a function, abort_http_object_request(), which unlink()s the object
file and invokes release_http_object_request(). Update
http-walker.c::abort_object_request() to use this.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years ago
|
|
|
/* Helpers for fetching object */
|
|
|
|
|
struct http_object_request {
|
http*: add helper methods for fetching objects (loose)
The code handling the fetching of loose objects in http-push.c and
http-walker.c have been refactored into new methods and a new struct
(object_http_request) in http.c. They are not meant to be invoked
elsewhere.
The new methods in http.c are
- new_http_object_request
- process_http_object_request
- finish_http_object_request
- abort_http_object_request
- release_http_object_request
and the new struct is http_object_request.
RANGER_HEADER_SIZE and no_pragma_header is no longer made available
outside of http.c, since after the above changes, there are no other
instances of usage outside of http.c.
Remove members of the transfer_request struct in http-push.c and
http-walker.c, including filename, real_sha1 and zret, as they are used
no longer used.
Move the methods append_remote_object_url() and get_remote_object_url()
from http-push.c to http.c. Additionally, get_remote_object_url() is no
longer defined only when USE_CURL_MULTI is defined, since
non-USE_CURL_MULTI code in http.c uses it (namely, in
new_http_object_request()).
Refactor code from http-push.c::start_fetch_loose() and
http-walker.c::start_object_fetch_request() that deals with the details
of coming up with the filename to store the retrieved object, resuming
a previously aborted request, and making a new curl request, into a new
function, new_http_object_request().
Refactor code from http-walker.c::process_object_request() into the
function, process_http_object_request().
Refactor code from http-push.c::finish_request() and
http-walker.c::finish_object_request() into a new function,
finish_http_object_request(). It returns the result of the
move_temp_to_file() invocation.
Add a function, release_http_object_request(), which cleans up object
request data. http-push.c and http-walker.c invoke this function
separately; http-push.c::release_request() and
http-walker.c::release_object_request() do not invoke this function.
Add a function, abort_http_object_request(), which unlink()s the object
file and invokes release_http_object_request(). Update
http-walker.c::abort_object_request() to use this.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years ago
|
|
|
char *url;
|
|
|
|
|
char tmpfile[PATH_MAX];
|
|
|
|
|
int localfile;
|
|
|
|
|
CURLcode curl_result;
|
|
|
|
|
char errorstr[CURL_ERROR_SIZE];
|
|
|
|
|
long http_code;
|
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
unsigned char real_sha1[20];
|
|
|
|
|
git_SHA_CTX c;
|
|
|
|
|
git_zstream stream;
|
http*: add helper methods for fetching objects (loose)
The code handling the fetching of loose objects in http-push.c and
http-walker.c have been refactored into new methods and a new struct
(object_http_request) in http.c. They are not meant to be invoked
elsewhere.
The new methods in http.c are
- new_http_object_request
- process_http_object_request
- finish_http_object_request
- abort_http_object_request
- release_http_object_request
and the new struct is http_object_request.
RANGER_HEADER_SIZE and no_pragma_header is no longer made available
outside of http.c, since after the above changes, there are no other
instances of usage outside of http.c.
Remove members of the transfer_request struct in http-push.c and
http-walker.c, including filename, real_sha1 and zret, as they are used
no longer used.
Move the methods append_remote_object_url() and get_remote_object_url()
from http-push.c to http.c. Additionally, get_remote_object_url() is no
longer defined only when USE_CURL_MULTI is defined, since
non-USE_CURL_MULTI code in http.c uses it (namely, in
new_http_object_request()).
Refactor code from http-push.c::start_fetch_loose() and
http-walker.c::start_object_fetch_request() that deals with the details
of coming up with the filename to store the retrieved object, resuming
a previously aborted request, and making a new curl request, into a new
function, new_http_object_request().
Refactor code from http-walker.c::process_object_request() into the
function, process_http_object_request().
Refactor code from http-push.c::finish_request() and
http-walker.c::finish_object_request() into a new function,
finish_http_object_request(). It returns the result of the
move_temp_to_file() invocation.
Add a function, release_http_object_request(), which cleans up object
request data. http-push.c and http-walker.c invoke this function
separately; http-push.c::release_request() and
http-walker.c::release_object_request() do not invoke this function.
Add a function, abort_http_object_request(), which unlink()s the object
file and invokes release_http_object_request(). Update
http-walker.c::abort_object_request() to use this.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
16 years ago
|
|
|
int zret;
|
|
|
|
|
int rename;
|
|
|
|
|
struct active_request_slot *slot;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern struct http_object_request *new_http_object_request(
|
|
|
|
|
const char *base_url, unsigned char *sha1);
|
|
|
|
|
extern void process_http_object_request(struct http_object_request *freq);
|
|
|
|
|
extern int finish_http_object_request(struct http_object_request *freq);
|
|
|
|
|
extern void abort_http_object_request(struct http_object_request *freq);
|
|
|
|
|
extern void release_http_object_request(struct http_object_request *freq);
|
|
|
|
|
|
|
|
|
|
#endif /* HTTP_H */
|
