2005-11-18 20:02:58 +01:00
|
|
|
#include "http.h"
|
|
|
|
|
|
|
|
int data_received;
|
2009-03-10 02:47:29 +01:00
|
|
|
int active_requests;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
|
|
|
#ifdef USE_CURL_MULTI
|
2007-12-09 18:04:57 +01:00
|
|
|
static int max_requests = -1;
|
|
|
|
static CURLM *curlm;
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
|
|
|
#ifndef NO_CURL_EASY_DUPHANDLE
|
2007-12-09 18:04:57 +01:00
|
|
|
static CURL *curl_default;
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
|
|
|
char curl_errorstr[CURL_ERROR_SIZE];
|
|
|
|
|
2007-12-09 18:04:57 +01:00
|
|
|
static int curl_ssl_verify = -1;
|
2009-03-10 02:47:29 +01:00
|
|
|
static const char *ssl_cert;
|
2005-11-18 20:02:58 +01:00
|
|
|
#if LIBCURL_VERSION_NUM >= 0x070902
|
2009-03-10 02:47:29 +01:00
|
|
|
static const char *ssl_key;
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
|
|
|
#if LIBCURL_VERSION_NUM >= 0x070908
|
2009-03-10 02:47:29 +01:00
|
|
|
static const char *ssl_capath;
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
2009-03-10 02:47:29 +01:00
|
|
|
static const char *ssl_cainfo;
|
2007-12-09 18:04:57 +01:00
|
|
|
static long curl_low_speed_limit = -1;
|
|
|
|
static long curl_low_speed_time = -1;
|
2009-03-10 02:47:29 +01:00
|
|
|
static int curl_ftp_no_epsv;
|
|
|
|
static const char *curl_http_proxy;
|
2009-03-10 07:34:25 +01:00
|
|
|
static char *user_name, *user_pass;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
2007-12-09 18:04:57 +01:00
|
|
|
static struct curl_slist *pragma_header;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
2009-03-10 02:47:29 +01:00
|
|
|
static struct active_request_slot *active_queue_head;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
2008-07-04 09:37:40 +02:00
|
|
|
size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
|
2005-11-18 20:02:58 +01:00
|
|
|
{
|
|
|
|
size_t size = eltsize * nmemb;
|
2008-07-04 09:37:40 +02:00
|
|
|
struct buffer *buffer = buffer_;
|
|
|
|
|
2007-12-09 20:30:59 +01:00
|
|
|
if (size > buffer->buf.len - buffer->posn)
|
|
|
|
size = buffer->buf.len - buffer->posn;
|
|
|
|
memcpy(ptr, buffer->buf.buf + buffer->posn, size);
|
2005-11-18 20:02:58 +01:00
|
|
|
buffer->posn += size;
|
2007-12-09 20:30:59 +01:00
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2008-07-04 09:37:40 +02:00
|
|
|
size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
|
2005-11-18 20:02:58 +01:00
|
|
|
{
|
|
|
|
size_t size = eltsize * nmemb;
|
2008-07-04 09:37:40 +02:00
|
|
|
struct strbuf *buffer = buffer_;
|
|
|
|
|
2007-12-09 20:30:59 +01:00
|
|
|
strbuf_add(buffer, ptr, size);
|
2005-11-18 20:02:58 +01:00
|
|
|
data_received++;
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
|
2008-07-04 09:37:40 +02:00
|
|
|
size_t fwrite_null(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf)
|
2005-11-18 20:02:58 +01:00
|
|
|
{
|
|
|
|
data_received++;
|
|
|
|
return eltsize * nmemb;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void finish_active_slot(struct active_request_slot *slot);
|
|
|
|
|
|
|
|
#ifdef USE_CURL_MULTI
|
|
|
|
static void process_curl_messages(void)
|
|
|
|
{
|
|
|
|
int num_messages;
|
|
|
|
struct active_request_slot *slot;
|
|
|
|
CURLMsg *curl_message = curl_multi_info_read(curlm, &num_messages);
|
|
|
|
|
|
|
|
while (curl_message != NULL) {
|
|
|
|
if (curl_message->msg == CURLMSG_DONE) {
|
|
|
|
int curl_result = curl_message->data.result;
|
|
|
|
slot = active_queue_head;
|
|
|
|
while (slot != NULL &&
|
|
|
|
slot->curl != curl_message->easy_handle)
|
|
|
|
slot = slot->next;
|
|
|
|
if (slot != NULL) {
|
|
|
|
curl_multi_remove_handle(curlm, slot->curl);
|
|
|
|
slot->curl_result = curl_result;
|
|
|
|
finish_active_slot(slot);
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Received DONE message for unknown request!\n");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
fprintf(stderr, "Unknown CURL message received: %d\n",
|
|
|
|
(int)curl_message->msg);
|
|
|
|
}
|
|
|
|
curl_message = curl_multi_info_read(curlm, &num_messages);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-05-14 19:46:53 +02:00
|
|
|
static int http_options(const char *var, const char *value, void *cb)
|
2005-11-18 20:02:58 +01:00
|
|
|
{
|
|
|
|
if (!strcmp("http.sslverify", var)) {
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
curl_ssl_verify = git_config_bool(var, value);
|
2005-11-18 20:02:58 +01:00
|
|
|
return 0;
|
|
|
|
}
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
if (!strcmp("http.sslcert", var))
|
|
|
|
return git_config_string(&ssl_cert, var, value);
|
2005-11-18 20:02:58 +01:00
|
|
|
#if LIBCURL_VERSION_NUM >= 0x070902
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
if (!strcmp("http.sslkey", var))
|
|
|
|
return git_config_string(&ssl_key, var, value);
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
|
|
|
#if LIBCURL_VERSION_NUM >= 0x070908
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
if (!strcmp("http.sslcapath", var))
|
|
|
|
return git_config_string(&ssl_capath, var, value);
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
if (!strcmp("http.sslcainfo", var))
|
|
|
|
return git_config_string(&ssl_cainfo, var, value);
|
2007-06-07 09:04:01 +02:00
|
|
|
#ifdef USE_CURL_MULTI
|
2005-11-18 20:02:58 +01:00
|
|
|
if (!strcmp("http.maxrequests", var)) {
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
max_requests = git_config_int(var, value);
|
2005-11-18 20:02:58 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (!strcmp("http.lowspeedlimit", var)) {
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
curl_low_speed_limit = (long)git_config_int(var, value);
|
2005-11-18 20:02:58 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strcmp("http.lowspeedtime", var)) {
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
curl_low_speed_time = (long)git_config_int(var, value);
|
2005-11-18 20:02:58 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-09-29 02:10:44 +02:00
|
|
|
if (!strcmp("http.noepsv", var)) {
|
|
|
|
curl_ftp_no_epsv = git_config_bool(var, value);
|
|
|
|
return 0;
|
|
|
|
}
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
if (!strcmp("http.proxy", var))
|
|
|
|
return git_config_string(&curl_http_proxy, var, value);
|
2006-09-29 02:10:44 +02:00
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
/* Fall back on the default ones */
|
2008-05-14 19:46:53 +02:00
|
|
|
return git_default_config(var, value, cb);
|
2005-11-18 20:02:58 +01:00
|
|
|
}
|
|
|
|
|
2009-03-10 07:34:25 +01:00
|
|
|
static void init_curl_http_auth(CURL *result)
|
|
|
|
{
|
2009-03-13 06:34:43 +01:00
|
|
|
if (user_name) {
|
2009-03-10 07:34:25 +01:00
|
|
|
struct strbuf up = STRBUF_INIT;
|
|
|
|
if (!user_pass)
|
|
|
|
user_pass = xstrdup(getpass("Password: "));
|
|
|
|
strbuf_addf(&up, "%s:%s", user_name, user_pass);
|
|
|
|
curl_easy_setopt(result, CURLOPT_USERPWD,
|
|
|
|
strbuf_detach(&up, NULL));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-03-10 02:47:29 +01:00
|
|
|
static CURL *get_curl_handle(void)
|
2005-11-19 02:06:46 +01:00
|
|
|
{
|
2009-03-10 02:47:29 +01:00
|
|
|
CURL *result = curl_easy_init();
|
2005-11-19 02:06:46 +01:00
|
|
|
|
2008-02-22 00:10:37 +01:00
|
|
|
if (!curl_ssl_verify) {
|
|
|
|
curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 0);
|
|
|
|
curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 0);
|
|
|
|
} else {
|
|
|
|
/* Verify authenticity of the peer's certificate */
|
|
|
|
curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 1);
|
|
|
|
/* The name in the cert must match whom we tried to connect */
|
|
|
|
curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2);
|
|
|
|
}
|
|
|
|
|
2005-11-19 02:06:46 +01:00
|
|
|
#if LIBCURL_VERSION_NUM >= 0x070907
|
|
|
|
curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
|
|
|
|
#endif
|
|
|
|
|
2009-03-10 07:34:25 +01:00
|
|
|
init_curl_http_auth(result);
|
|
|
|
|
2005-11-19 02:06:46 +01:00
|
|
|
if (ssl_cert != NULL)
|
|
|
|
curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert);
|
|
|
|
#if LIBCURL_VERSION_NUM >= 0x070902
|
|
|
|
if (ssl_key != NULL)
|
|
|
|
curl_easy_setopt(result, CURLOPT_SSLKEY, ssl_key);
|
|
|
|
#endif
|
|
|
|
#if LIBCURL_VERSION_NUM >= 0x070908
|
|
|
|
if (ssl_capath != NULL)
|
|
|
|
curl_easy_setopt(result, CURLOPT_CAPATH, ssl_capath);
|
|
|
|
#endif
|
|
|
|
if (ssl_cainfo != NULL)
|
|
|
|
curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
|
|
|
|
curl_easy_setopt(result, CURLOPT_FAILONERROR, 1);
|
|
|
|
|
|
|
|
if (curl_low_speed_limit > 0 && curl_low_speed_time > 0) {
|
|
|
|
curl_easy_setopt(result, CURLOPT_LOW_SPEED_LIMIT,
|
|
|
|
curl_low_speed_limit);
|
|
|
|
curl_easy_setopt(result, CURLOPT_LOW_SPEED_TIME,
|
|
|
|
curl_low_speed_time);
|
|
|
|
}
|
|
|
|
|
|
|
|
curl_easy_setopt(result, CURLOPT_FOLLOWLOCATION, 1);
|
|
|
|
|
2006-02-01 12:44:37 +01:00
|
|
|
if (getenv("GIT_CURL_VERBOSE"))
|
|
|
|
curl_easy_setopt(result, CURLOPT_VERBOSE, 1);
|
|
|
|
|
2006-04-04 19:11:29 +02:00
|
|
|
curl_easy_setopt(result, CURLOPT_USERAGENT, GIT_USER_AGENT);
|
|
|
|
|
2006-09-29 02:10:44 +02:00
|
|
|
if (curl_ftp_no_epsv)
|
|
|
|
curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
|
|
|
|
|
2007-11-23 01:07:00 +01:00
|
|
|
if (curl_http_proxy)
|
|
|
|
curl_easy_setopt(result, CURLOPT_PROXY, curl_http_proxy);
|
|
|
|
|
2005-11-19 02:06:46 +01:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2009-03-10 07:34:25 +01:00
|
|
|
static void http_auth_init(const char *url)
|
|
|
|
{
|
|
|
|
char *at, *colon, *cp, *slash;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
cp = strstr(url, "://");
|
|
|
|
if (!cp)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Ok, the URL looks like "proto://something". Which one?
|
|
|
|
* "proto://<user>:<pass>@<host>/...",
|
|
|
|
* "proto://<user>@<host>/...", or just
|
|
|
|
* "proto://<host>/..."?
|
|
|
|
*/
|
|
|
|
cp += 3;
|
|
|
|
at = strchr(cp, '@');
|
|
|
|
colon = strchr(cp, ':');
|
|
|
|
slash = strchrnul(cp, '/');
|
|
|
|
if (!at || slash <= at)
|
|
|
|
return; /* No credentials */
|
|
|
|
if (!colon || at <= colon) {
|
|
|
|
/* Only username */
|
|
|
|
len = at - cp;
|
|
|
|
user_name = xmalloc(len + 1);
|
|
|
|
memcpy(user_name, cp, len);
|
|
|
|
user_name[len] = '\0';
|
|
|
|
user_pass = NULL;
|
|
|
|
} else {
|
|
|
|
len = colon - cp;
|
|
|
|
user_name = xmalloc(len + 1);
|
|
|
|
memcpy(user_name, cp, len);
|
|
|
|
user_name[len] = '\0';
|
|
|
|
len = at - (colon + 1);
|
|
|
|
user_pass = xmalloc(len + 1);
|
|
|
|
memcpy(user_pass, colon + 1, len);
|
|
|
|
user_pass[len] = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
static void set_from_env(const char **var, const char *envname)
|
|
|
|
{
|
|
|
|
const char *val = getenv(envname);
|
|
|
|
if (val)
|
|
|
|
*var = val;
|
|
|
|
}
|
|
|
|
|
2008-02-27 21:35:50 +01:00
|
|
|
void http_init(struct remote *remote)
|
2005-11-18 20:02:58 +01:00
|
|
|
{
|
|
|
|
char *low_speed_limit;
|
|
|
|
char *low_speed_time;
|
|
|
|
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
git_config(http_options, NULL);
|
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
curl_global_init(CURL_GLOBAL_ALL);
|
|
|
|
|
2008-02-27 21:35:50 +01:00
|
|
|
if (remote && remote->http_proxy)
|
|
|
|
curl_http_proxy = xstrdup(remote->http_proxy);
|
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache");
|
|
|
|
|
|
|
|
#ifdef USE_CURL_MULTI
|
|
|
|
{
|
|
|
|
char *http_max_requests = getenv("GIT_HTTP_MAX_REQUESTS");
|
|
|
|
if (http_max_requests != NULL)
|
|
|
|
max_requests = atoi(http_max_requests);
|
|
|
|
}
|
|
|
|
|
|
|
|
curlm = curl_multi_init();
|
|
|
|
if (curlm == NULL) {
|
|
|
|
fprintf(stderr, "Error creating curl multi handle.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (getenv("GIT_SSL_NO_VERIFY"))
|
|
|
|
curl_ssl_verify = 0;
|
|
|
|
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
set_from_env(&ssl_cert, "GIT_SSL_CERT");
|
2005-11-18 20:02:58 +01:00
|
|
|
#if LIBCURL_VERSION_NUM >= 0x070902
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
set_from_env(&ssl_key, "GIT_SSL_KEY");
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
|
|
|
#if LIBCURL_VERSION_NUM >= 0x070908
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
http_init(): Fix config file parsing
We honor the command line options, environment variables, variables in
repository configuration file, variables in user's global configuration
file, variables in the system configuration file, and then finally use
built-in default. To implement this semantics, the code should:
- start from built-in default values;
- call git_config() with the configuration parser callback, which
implements "later definition overrides earlier ones" logic
(git_config() reads the system's, user's and then repository's
configuration file in this order);
- override the result from the above with environment variables if set;
- override the result from the above with command line options.
The initialization code http_init() for http transfer got this wrong, and
implemented a "first one wins, ignoring the later ones" in http_options(),
to compensate this mistake, read environment variables before calling
git_config(). This is all wrong.
As a second class citizen, the http codepath hasn't been audited as
closely as other parts of the system, but we should try to bring sanity to
it, before inviting contributors to improve on it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-10 03:00:30 +01:00
|
|
|
set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
|
2005-11-18 20:02:58 +01:00
|
|
|
|
|
|
|
low_speed_limit = getenv("GIT_HTTP_LOW_SPEED_LIMIT");
|
|
|
|
if (low_speed_limit != NULL)
|
|
|
|
curl_low_speed_limit = strtol(low_speed_limit, NULL, 10);
|
|
|
|
low_speed_time = getenv("GIT_HTTP_LOW_SPEED_TIME");
|
|
|
|
if (low_speed_time != NULL)
|
|
|
|
curl_low_speed_time = strtol(low_speed_time, NULL, 10);
|
|
|
|
|
|
|
|
if (curl_ssl_verify == -1)
|
|
|
|
curl_ssl_verify = 1;
|
|
|
|
|
|
|
|
#ifdef USE_CURL_MULTI
|
|
|
|
if (max_requests < 1)
|
|
|
|
max_requests = DEFAULT_MAX_REQUESTS;
|
|
|
|
#endif
|
|
|
|
|
2006-09-29 02:10:44 +02:00
|
|
|
if (getenv("GIT_CURL_FTP_NO_EPSV"))
|
|
|
|
curl_ftp_no_epsv = 1;
|
|
|
|
|
2009-03-10 07:34:25 +01:00
|
|
|
if (remote && remote->url && remote->url[0])
|
|
|
|
http_auth_init(remote->url[0]);
|
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
#ifndef NO_CURL_EASY_DUPHANDLE
|
|
|
|
curl_default = get_curl_handle();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void http_cleanup(void)
|
|
|
|
{
|
|
|
|
struct active_request_slot *slot = active_queue_head;
|
|
|
|
|
|
|
|
while (slot != NULL) {
|
2007-09-15 09:23:00 +02:00
|
|
|
struct active_request_slot *next = slot->next;
|
2008-03-03 20:30:16 +01:00
|
|
|
if (slot->curl != NULL) {
|
2005-11-18 20:02:58 +01:00
|
|
|
#ifdef USE_CURL_MULTI
|
2008-03-03 20:30:16 +01:00
|
|
|
curl_multi_remove_handle(curlm, slot->curl);
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
|
|
|
curl_easy_cleanup(slot->curl);
|
2008-03-03 20:30:16 +01:00
|
|
|
}
|
2007-09-15 09:23:00 +02:00
|
|
|
free(slot);
|
|
|
|
slot = next;
|
2005-11-18 20:02:58 +01:00
|
|
|
}
|
2007-09-15 09:23:00 +02:00
|
|
|
active_queue_head = NULL;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
|
|
|
#ifndef NO_CURL_EASY_DUPHANDLE
|
|
|
|
curl_easy_cleanup(curl_default);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef USE_CURL_MULTI
|
|
|
|
curl_multi_cleanup(curlm);
|
|
|
|
#endif
|
|
|
|
curl_global_cleanup();
|
2006-06-06 18:41:32 +02:00
|
|
|
|
|
|
|
curl_slist_free_all(pragma_header);
|
2007-09-15 09:23:00 +02:00
|
|
|
pragma_header = NULL;
|
2008-02-27 21:35:50 +01:00
|
|
|
|
|
|
|
if (curl_http_proxy) {
|
2008-12-07 01:45:37 +01:00
|
|
|
free((void *)curl_http_proxy);
|
2008-02-27 21:35:50 +01:00
|
|
|
curl_http_proxy = NULL;
|
|
|
|
}
|
2005-11-18 20:02:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
struct active_request_slot *get_active_slot(void)
|
|
|
|
{
|
|
|
|
struct active_request_slot *slot = active_queue_head;
|
|
|
|
struct active_request_slot *newslot;
|
|
|
|
|
|
|
|
#ifdef USE_CURL_MULTI
|
|
|
|
int num_transfers;
|
|
|
|
|
|
|
|
/* Wait for a slot to open up if the queue is full */
|
|
|
|
while (active_requests >= max_requests) {
|
|
|
|
curl_multi_perform(curlm, &num_transfers);
|
2009-03-10 02:47:29 +01:00
|
|
|
if (num_transfers < active_requests)
|
2005-11-18 20:02:58 +01:00
|
|
|
process_curl_messages();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2009-03-10 02:47:29 +01:00
|
|
|
while (slot != NULL && slot->in_use)
|
2005-11-18 20:02:58 +01:00
|
|
|
slot = slot->next;
|
2009-03-10 02:47:29 +01:00
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
if (slot == NULL) {
|
|
|
|
newslot = xmalloc(sizeof(*newslot));
|
|
|
|
newslot->curl = NULL;
|
|
|
|
newslot->in_use = 0;
|
|
|
|
newslot->next = NULL;
|
|
|
|
|
|
|
|
slot = active_queue_head;
|
|
|
|
if (slot == NULL) {
|
|
|
|
active_queue_head = newslot;
|
|
|
|
} else {
|
2009-03-10 02:47:29 +01:00
|
|
|
while (slot->next != NULL)
|
2005-11-18 20:02:58 +01:00
|
|
|
slot = slot->next;
|
|
|
|
slot->next = newslot;
|
|
|
|
}
|
|
|
|
slot = newslot;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (slot->curl == NULL) {
|
|
|
|
#ifdef NO_CURL_EASY_DUPHANDLE
|
|
|
|
slot->curl = get_curl_handle();
|
|
|
|
#else
|
|
|
|
slot->curl = curl_easy_duphandle(curl_default);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
active_requests++;
|
|
|
|
slot->in_use = 1;
|
|
|
|
slot->local = NULL;
|
2006-01-31 20:06:55 +01:00
|
|
|
slot->results = NULL;
|
2006-03-11 05:18:01 +01:00
|
|
|
slot->finished = NULL;
|
2005-11-18 20:02:58 +01:00
|
|
|
slot->callback_data = NULL;
|
|
|
|
slot->callback_func = NULL;
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, pragma_header);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, curl_errorstr);
|
2006-06-01 01:25:03 +02:00
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_CUSTOMREQUEST, NULL);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_READFUNCTION, NULL);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, NULL);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 0);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
|
2005-11-18 20:02:58 +01:00
|
|
|
|
|
|
|
return slot;
|
|
|
|
}
|
|
|
|
|
|
|
|
int start_active_slot(struct active_request_slot *slot)
|
|
|
|
{
|
|
|
|
#ifdef USE_CURL_MULTI
|
|
|
|
CURLMcode curlm_result = curl_multi_add_handle(curlm, slot->curl);
|
2007-09-11 05:02:28 +02:00
|
|
|
int num_transfers;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
|
|
|
if (curlm_result != CURLM_OK &&
|
|
|
|
curlm_result != CURLM_CALL_MULTI_PERFORM) {
|
|
|
|
active_requests--;
|
|
|
|
slot->in_use = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
2007-09-11 05:02:28 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We know there must be something to do, since we just added
|
|
|
|
* something.
|
|
|
|
*/
|
|
|
|
curl_multi_perform(curlm, &num_transfers);
|
2005-11-18 20:02:58 +01:00
|
|
|
#endif
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef USE_CURL_MULTI
|
2007-09-11 05:02:34 +02:00
|
|
|
struct fill_chain {
|
|
|
|
void *data;
|
|
|
|
int (*fill)(void *);
|
|
|
|
struct fill_chain *next;
|
|
|
|
};
|
|
|
|
|
2009-03-10 02:47:29 +01:00
|
|
|
static struct fill_chain *fill_cfg;
|
2007-09-11 05:02:34 +02:00
|
|
|
|
|
|
|
void add_fill_function(void *data, int (*fill)(void *))
|
|
|
|
{
|
2008-09-09 20:57:10 +02:00
|
|
|
struct fill_chain *new = xmalloc(sizeof(*new));
|
2007-09-11 05:02:34 +02:00
|
|
|
struct fill_chain **linkp = &fill_cfg;
|
|
|
|
new->data = data;
|
|
|
|
new->fill = fill;
|
|
|
|
new->next = NULL;
|
|
|
|
while (*linkp)
|
|
|
|
linkp = &(*linkp)->next;
|
|
|
|
*linkp = new;
|
|
|
|
}
|
|
|
|
|
2007-09-11 05:02:28 +02:00
|
|
|
void fill_active_slots(void)
|
|
|
|
{
|
|
|
|
struct active_request_slot *slot = active_queue_head;
|
|
|
|
|
2007-09-11 05:02:34 +02:00
|
|
|
while (active_requests < max_requests) {
|
|
|
|
struct fill_chain *fill;
|
|
|
|
for (fill = fill_cfg; fill; fill = fill->next)
|
|
|
|
if (fill->fill(fill->data))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (!fill)
|
2007-09-11 05:02:28 +02:00
|
|
|
break;
|
2007-09-11 05:02:34 +02:00
|
|
|
}
|
2007-09-11 05:02:28 +02:00
|
|
|
|
|
|
|
while (slot != NULL) {
|
|
|
|
if (!slot->in_use && slot->curl != NULL) {
|
|
|
|
curl_easy_cleanup(slot->curl);
|
|
|
|
slot->curl = NULL;
|
|
|
|
}
|
|
|
|
slot = slot->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-11-18 20:02:58 +01:00
|
|
|
void step_active_slots(void)
|
|
|
|
{
|
|
|
|
int num_transfers;
|
|
|
|
CURLMcode curlm_result;
|
|
|
|
|
|
|
|
do {
|
|
|
|
curlm_result = curl_multi_perform(curlm, &num_transfers);
|
|
|
|
} while (curlm_result == CURLM_CALL_MULTI_PERFORM);
|
|
|
|
if (num_transfers < active_requests) {
|
|
|
|
process_curl_messages();
|
|
|
|
fill_active_slots();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void run_active_slot(struct active_request_slot *slot)
|
|
|
|
{
|
|
|
|
#ifdef USE_CURL_MULTI
|
|
|
|
long last_pos = 0;
|
|
|
|
long current_pos;
|
|
|
|
fd_set readfds;
|
|
|
|
fd_set writefds;
|
|
|
|
fd_set excfds;
|
|
|
|
int max_fd;
|
|
|
|
struct timeval select_timeout;
|
2006-03-11 05:18:01 +01:00
|
|
|
int finished = 0;
|
2005-11-18 20:02:58 +01:00
|
|
|
|
2006-03-11 05:18:01 +01:00
|
|
|
slot->finished = &finished;
|
|
|
|
while (!finished) {
|
2005-11-18 20:02:58 +01:00
|
|
|
data_received = 0;
|
|
|
|
step_active_slots();
|
|
|
|
|
|
|
|
if (!data_received && slot->local != NULL) {
|
|
|
|
current_pos = ftell(slot->local);
|
|
|
|
if (current_pos > last_pos)
|
|
|
|
data_received++;
|
|
|
|
last_pos = current_pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (slot->in_use && !data_received) {
|
|
|
|
max_fd = 0;
|
|
|
|
FD_ZERO(&readfds);
|
|
|
|
FD_ZERO(&writefds);
|
|
|
|
FD_ZERO(&excfds);
|
|
|
|
select_timeout.tv_sec = 0;
|
|
|
|
select_timeout.tv_usec = 50000;
|
|
|
|
select(max_fd, &readfds, &writefds,
|
|
|
|
&excfds, &select_timeout);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
while (slot->in_use) {
|
|
|
|
slot->curl_result = curl_easy_perform(slot->curl);
|
|
|
|
finish_active_slot(slot);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2006-02-07 11:07:39 +01:00
|
|
|
static void closedown_active_slot(struct active_request_slot *slot)
|
2005-11-18 20:02:58 +01:00
|
|
|
{
|
2007-12-09 20:30:59 +01:00
|
|
|
active_requests--;
|
|
|
|
slot->in_use = 0;
|
2006-02-07 11:07:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void release_active_slot(struct active_request_slot *slot)
|
|
|
|
{
|
|
|
|
closedown_active_slot(slot);
|
|
|
|
if (slot->curl) {
|
2006-06-06 18:41:32 +02:00
|
|
|
#ifdef USE_CURL_MULTI
|
2006-02-07 11:07:39 +01:00
|
|
|
curl_multi_remove_handle(curlm, slot->curl);
|
2006-06-06 18:41:32 +02:00
|
|
|
#endif
|
2006-02-07 11:07:39 +01:00
|
|
|
curl_easy_cleanup(slot->curl);
|
|
|
|
slot->curl = NULL;
|
|
|
|
}
|
2006-06-06 18:41:32 +02:00
|
|
|
#ifdef USE_CURL_MULTI
|
2006-02-07 11:07:39 +01:00
|
|
|
fill_active_slots();
|
2006-06-06 18:41:32 +02:00
|
|
|
#endif
|
2006-02-07 11:07:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void finish_active_slot(struct active_request_slot *slot)
|
|
|
|
{
|
|
|
|
closedown_active_slot(slot);
|
2007-12-09 20:30:59 +01:00
|
|
|
curl_easy_getinfo(slot->curl, CURLINFO_HTTP_CODE, &slot->http_code);
|
2006-01-31 20:06:55 +01:00
|
|
|
|
2006-03-11 05:18:01 +01:00
|
|
|
if (slot->finished != NULL)
|
|
|
|
(*slot->finished) = 1;
|
|
|
|
|
2006-01-31 20:06:55 +01:00
|
|
|
/* Store slot results so they can be read after the slot is reused */
|
|
|
|
if (slot->results != NULL) {
|
|
|
|
slot->results->curl_result = slot->curl_result;
|
|
|
|
slot->results->http_code = slot->http_code;
|
|
|
|
}
|
|
|
|
|
2007-12-09 20:30:59 +01:00
|
|
|
/* Run callback if appropriate */
|
2009-03-10 02:47:29 +01:00
|
|
|
if (slot->callback_func != NULL)
|
2007-12-09 20:30:59 +01:00
|
|
|
slot->callback_func(slot->callback_data);
|
2005-11-18 20:02:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void finish_all_active_slots(void)
|
|
|
|
{
|
|
|
|
struct active_request_slot *slot = active_queue_head;
|
|
|
|
|
|
|
|
while (slot != NULL)
|
|
|
|
if (slot->in_use) {
|
|
|
|
run_active_slot(slot);
|
|
|
|
slot = active_queue_head;
|
|
|
|
} else {
|
|
|
|
slot = slot->next;
|
|
|
|
}
|
|
|
|
}
|
2007-12-11 00:08:25 +01:00
|
|
|
|
|
|
|
static inline int needs_quote(int ch)
|
|
|
|
{
|
|
|
|
if (((ch >= 'A') && (ch <= 'Z'))
|
|
|
|
|| ((ch >= 'a') && (ch <= 'z'))
|
|
|
|
|| ((ch >= '0') && (ch <= '9'))
|
|
|
|
|| (ch == '/')
|
|
|
|
|| (ch == '-')
|
|
|
|
|| (ch == '.'))
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int hex(int v)
|
|
|
|
{
|
2009-03-10 02:47:29 +01:00
|
|
|
if (v < 10)
|
|
|
|
return '0' + v;
|
|
|
|
else
|
|
|
|
return 'A' + v - 10;
|
2007-12-11 00:08:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static char *quote_ref_url(const char *base, const char *ref)
|
|
|
|
{
|
2009-03-07 17:47:21 +01:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2007-12-11 00:08:25 +01:00
|
|
|
const char *cp;
|
2009-03-07 17:47:21 +01:00
|
|
|
int ch;
|
2007-12-11 00:08:25 +01:00
|
|
|
|
2009-03-07 17:47:21 +01:00
|
|
|
strbuf_addstr(&buf, base);
|
|
|
|
if (buf.len && buf.buf[buf.len - 1] != '/' && *ref != '/')
|
|
|
|
strbuf_addstr(&buf, "/");
|
|
|
|
|
|
|
|
for (cp = ref; (ch = *cp) != 0; cp++)
|
2007-12-11 00:08:25 +01:00
|
|
|
if (needs_quote(ch))
|
2009-03-07 17:47:21 +01:00
|
|
|
strbuf_addf(&buf, "%%%02x", ch);
|
2007-12-11 00:08:25 +01:00
|
|
|
else
|
2009-03-07 17:47:21 +01:00
|
|
|
strbuf_addch(&buf, *cp);
|
2007-12-11 00:08:25 +01:00
|
|
|
|
2009-03-07 17:47:21 +01:00
|
|
|
return strbuf_detach(&buf, NULL);
|
2007-12-11 00:08:25 +01:00
|
|
|
}
|
|
|
|
|
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>
2008-04-26 21:53:09 +02:00
|
|
|
int http_fetch_ref(const char *base, struct ref *ref)
|
2007-12-11 00:08:25 +01:00
|
|
|
{
|
|
|
|
char *url;
|
|
|
|
struct strbuf buffer = STRBUF_INIT;
|
|
|
|
struct active_request_slot *slot;
|
|
|
|
struct slot_results results;
|
|
|
|
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>
2008-04-26 21:53:09 +02:00
|
|
|
url = quote_ref_url(base, ref->name);
|
2007-12-11 00:08:25 +01:00
|
|
|
slot = get_active_slot();
|
|
|
|
slot->results = &results;
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
|
|
|
|
curl_easy_setopt(slot->curl, CURLOPT_URL, url);
|
|
|
|
if (start_active_slot(slot)) {
|
|
|
|
run_active_slot(slot);
|
|
|
|
if (results.curl_result == CURLE_OK) {
|
|
|
|
strbuf_rtrim(&buffer);
|
|
|
|
if (buffer.len == 40)
|
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>
2008-04-26 21:53:09 +02:00
|
|
|
ret = get_sha1_hex(buffer.buf, ref->old_sha1);
|
2008-04-26 21:53:12 +02:00
|
|
|
else if (!prefixcmp(buffer.buf, "ref: ")) {
|
|
|
|
ref->symref = xstrdup(buffer.buf + 5);
|
|
|
|
ret = 0;
|
|
|
|
} else
|
2007-12-11 00:08:25 +01:00
|
|
|
ret = 1;
|
|
|
|
} else {
|
|
|
|
ret = error("Couldn't get %s for %s\n%s",
|
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>
2008-04-26 21:53:09 +02:00
|
|
|
url, ref->name, curl_errorstr);
|
2007-12-11 00:08:25 +01:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ret = error("Unable to start request");
|
|
|
|
}
|
|
|
|
|
|
|
|
strbuf_release(&buffer);
|
|
|
|
free(url);
|
|
|
|
return ret;
|
|
|
|
}
|