mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http*: move common variables and macros to http.[ch]

Browse Source 
Move RANGE_HEADER_SIZE to http.h.

Create no_pragma_header, the curl header list containing the header
"Pragma:" in http.[ch]. It is allocated in http_init, and freed in
http_cleanup. This replaces the no_pragma_header in http-push.c, and
the no_pragma_header member in walker_data in http-walker.c.

Create http_is_verbose. It is to be used by methods in http.c, and is
modified at the entry points of http.c's users, namely http-push.c
(when parsing options) and http-walker.c (in get_http_walker).

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tay Ray Chuan
2009-06-06 16:43:41 +08:00
committed by Junio C Hamano
parent df005219dd
commit e917674597
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
http-push.c
View File

@ -27,7 +27,6 @@ enum XML_Status {
#endif #endif
#define PREV_BUF_SIZE 4096 #define PREV_BUF_SIZE 4096
#define RANGE_HEADER_SIZE 30
/* DAV methods */ /* DAV methods */
#define DAV_LOCK "LOCK" #define DAV_LOCK "LOCK"
@ -76,8 +75,6 @@ static int pushing;
static int aborted; static int aborted;
static signed char remote_dir_exists[256]; static signed char remote_dir_exists[256];
static struct curl_slist *no_pragma_header;
static int push_verbosely; static int push_verbosely;
static int push_all = MATCH_REFS_NONE; static int push_all = MATCH_REFS_NONE;
static int force_all; static int force_all;
@ -2250,6 +2247,7 @@ int main(int argc, char **argv)
} }
if (!strcmp(arg, "--verbose")) { if (!strcmp(arg, "--verbose")) {
push_verbosely = 1; push_verbosely = 1;
http_is_verbose = 1;
continue; continue;
} }
if (!strcmp(arg, "-d")) { if (!strcmp(arg, "-d")) {
@ -2299,8 +2297,6 @@ int main(int argc, char **argv)
remote->url[remote->url_nr++] = repo->url; remote->url[remote->url_nr++] = repo->url;
http_init(remote); http_init(remote);
no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
if (repo->url && repo->url[strlen(repo->url)-1] != '/') { if (repo->url && repo->url[strlen(repo->url)-1] != '/') {
rewritten_url = xmalloc(strlen(repo->url)+2); rewritten_url = xmalloc(strlen(repo->url)+2);
strcpy(rewritten_url, repo->url); strcpy(rewritten_url, repo->url);
@ -2503,8 +2499,6 @@ int main(int argc, char **argv)
unlock_remote(info_ref_lock); unlock_remote(info_ref_lock);
free(repo); free(repo);
curl_slist_free_all(no_pragma_header);
http_cleanup(); http_cleanup();
request = request_queue_head; request = request_queue_head;

18
http-walker.c
View File

@ -5,7 +5,6 @@
#include "http.h" #include "http.h"
#define PREV_BUF_SIZE 4096 #define PREV_BUF_SIZE 4096
#define RANGE_HEADER_SIZE 30
struct alt_base struct alt_base
{ {
@ -57,7 +56,6 @@ struct walker_data {
const char *url; const char *url;
int got_alternates; int got_alternates;
struct alt_base *alt; struct alt_base *alt;
struct curl_slist *no_pragma_header;
}; };
static struct object_request *object_queue_head; static struct object_request *object_queue_head;
@ -108,7 +106,6 @@ static void start_object_request(struct walker *walker,
char range[RANGE_HEADER_SIZE]; char range[RANGE_HEADER_SIZE];
struct curl_slist *range_header = NULL; struct curl_slist *range_header = NULL;
struct active_request_slot *slot; struct active_request_slot *slot;
struct walker_data *data = walker->data;
snprintf(prevfile, sizeof(prevfile), "%s.prev", obj_req->filename); snprintf(prevfile, sizeof(prevfile), "%s.prev", obj_req->filename);
unlink_or_warn(prevfile); unlink_or_warn(prevfile);
@ -205,7 +202,7 @@ static void start_object_request(struct walker *walker,
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file); curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, obj_req->errorstr); curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, obj_req->errorstr);
curl_easy_setopt(slot->curl, CURLOPT_URL, url); curl_easy_setopt(slot->curl, CURLOPT_URL, url);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, data->no_pragma_header); curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header);
/* /*
* If we have successfully processed data from a previous fetch * If we have successfully processed data from a previous fetch
@ -354,6 +351,8 @@ static void prefetch(struct walker *walker, unsigned char *sha1)
newreq->slot = NULL; newreq->slot = NULL;
newreq->next = NULL; newreq->next = NULL;
http_is_verbose = walker->get_verbosely;
if (object_queue_head == NULL) { if (object_queue_head == NULL) {
object_queue_head = newreq; object_queue_head = newreq;
} else { } else {
@ -379,7 +378,6 @@ static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned ch
long prev_posn = 0; long prev_posn = 0;
char range[RANGE_HEADER_SIZE]; char range[RANGE_HEADER_SIZE];
struct curl_slist *range_header = NULL; struct curl_slist *range_header = NULL;
struct walker_data *data = walker->data;
FILE *indexfile; FILE *indexfile;
struct active_request_slot *slot; struct active_request_slot *slot;
@ -430,7 +428,7 @@ static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned ch
curl_easy_setopt(slot->curl, CURLOPT_FILE, indexfile); curl_easy_setopt(slot->curl, CURLOPT_FILE, indexfile);
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite); curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite);
curl_easy_setopt(slot->curl, CURLOPT_URL, url); curl_easy_setopt(slot->curl, CURLOPT_URL, url);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, data->no_pragma_header); curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header);
slot->local = indexfile; slot->local = indexfile;
/* /*
@ -768,7 +766,6 @@ static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned cha
long prev_posn = 0; long prev_posn = 0;
char range[RANGE_HEADER_SIZE]; char range[RANGE_HEADER_SIZE];
struct curl_slist *range_header = NULL; struct curl_slist *range_header = NULL;
struct walker_data *data = walker->data;
struct active_request_slot *slot; struct active_request_slot *slot;
struct slot_results results; struct slot_results results;
@ -802,7 +799,7 @@ static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned cha
curl_easy_setopt(slot->curl, CURLOPT_FILE, packfile); curl_easy_setopt(slot->curl, CURLOPT_FILE, packfile);
curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite); curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite);
curl_easy_setopt(slot->curl, CURLOPT_URL, url); curl_easy_setopt(slot->curl, CURLOPT_URL, url);
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, data->no_pragma_header); curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, no_pragma_header);
slot->local = packfile; slot->local = packfile;
/* /*
@ -948,10 +945,7 @@ static int fetch_ref(struct walker *walker, struct ref *ref)
static void cleanup(struct walker *walker) static void cleanup(struct walker *walker)
{ {
struct walker_data *data = walker->data;
http_cleanup(); http_cleanup();
curl_slist_free_all(data->no_pragma_header);
} }
struct walker *get_http_walker(const char *url, struct remote *remote) struct walker *get_http_walker(const char *url, struct remote *remote)
@ -962,8 +956,6 @@ struct walker *get_http_walker(const char *url, struct remote *remote)
http_init(remote); http_init(remote);
data->no_pragma_header = curl_slist_append(NULL, "Pragma:");
data->alt = xmalloc(sizeof(*data->alt)); data->alt = xmalloc(sizeof(*data->alt));
data->alt->base = xmalloc(strlen(url) + 1); data->alt->base = xmalloc(strlen(url) + 1);
strcpy(data->alt->base, url); strcpy(data->alt->base, url);

9
http.c
View File

@ -2,6 +2,7 @@
int data_received; int data_received;
int active_requests; int active_requests;
int http_is_verbose;
#ifdef USE_CURL_MULTI #ifdef USE_CURL_MULTI
static int max_requests = -1; static int max_requests = -1;
@ -29,6 +30,8 @@ static char *user_name, *user_pass;
static struct curl_slist *pragma_header; static struct curl_slist *pragma_header;
struct curl_slist *no_pragma_header;
static struct active_request_slot *active_queue_head; static struct active_request_slot *active_queue_head;
size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *buffer_) size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
@ -276,6 +279,8 @@ void http_init(struct remote *remote)
char *low_speed_limit; char *low_speed_limit;
char *low_speed_time; char *low_speed_time;
http_is_verbose = 0;
git_config(http_options, NULL); git_config(http_options, NULL);
curl_global_init(CURL_GLOBAL_ALL); curl_global_init(CURL_GLOBAL_ALL);
@ -284,6 +289,7 @@ void http_init(struct remote *remote)
curl_http_proxy = xstrdup(remote->http_proxy); curl_http_proxy = xstrdup(remote->http_proxy);
pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache"); pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache");
no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");
#ifdef USE_CURL_MULTI #ifdef USE_CURL_MULTI
{ {
@ -366,6 +372,9 @@ void http_cleanup(void)
curl_slist_free_all(pragma_header); curl_slist_free_all(pragma_header);
pragma_header = NULL; pragma_header = NULL;
curl_slist_free_all(no_pragma_header);
no_pragma_header = NULL;
if (curl_http_proxy) { if (curl_http_proxy) {
free((void *)curl_http_proxy); free((void *)curl_http_proxy);
curl_http_proxy = NULL; curl_http_proxy = NULL;

5
http.h
View File

@ -88,11 +88,16 @@ extern void add_fill_function(void *data, int (*fill)(void *));
extern void step_active_slots(void); extern void step_active_slots(void);
#endif #endif
extern struct curl_slist *no_pragma_header;
#define RANGE_HEADER_SIZE 30
extern void http_init(struct remote *remote); extern void http_init(struct remote *remote);
extern void http_cleanup(void); extern void http_cleanup(void);
extern int data_received; extern int data_received;
extern int active_requests; extern int active_requests;
extern int http_is_verbose;
extern char curl_errorstr[CURL_ERROR_SIZE]; extern char curl_errorstr[CURL_ERROR_SIZE];