Skip to content

Commit

Permalink
http*: move common variables and macros to http.[ch]
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@rctay @gitster
rctay authored and gitster committed Jun 6, 2009
1 parent df00521 commit e917674
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
8 changes: 1 addition & 7 deletions http-push.c
View file
Expand Up @@ -27,7 +27,6 @@ enum XML_Status {
#endif

#define PREV_BUF_SIZE 4096
#define RANGE_HEADER_SIZE 30

/* DAV methods */
#define DAV_LOCK "LOCK"
Expand Down Expand Up @@ -76,8 +75,6 @@ static int pushing;
static int aborted;
static signed char remote_dir_exists[256];

static struct curl_slist *no_pragma_header;

static int push_verbosely;
static int push_all = MATCH_REFS_NONE;
static int force_all;
Expand Down Expand Up @@ -2250,6 +2247,7 @@ int main(int argc, char **argv)
}
if (!strcmp(arg, "--verbose")) {
push_verbosely = 1;
http_is_verbose = 1;
continue;
}
if (!strcmp(arg, "-d")) {
Expand Down Expand Up @@ -2299,8 +2297,6 @@ int main(int argc, char **argv)
remote->url[remote->url_nr++] = repo->url;
http_init(remote);

no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");

if (repo->url && repo->url[strlen(repo->url)-1] != '/') {
rewritten_url = xmalloc(strlen(repo->url)+2);
strcpy(rewritten_url, repo->url);
Expand Down Expand Up @@ -2503,8 +2499,6 @@ int main(int argc, char **argv)
unlock_remote(info_ref_lock);
free(repo);

curl_slist_free_all(no_pragma_header);

http_cleanup();

request = request_queue_head;
Expand Down
18 changes: 5 additions & 13 deletions http-walker.c
View file
Expand Up @@ -5,7 +5,6 @@
#include "http.h"

#define PREV_BUF_SIZE 4096
#define RANGE_HEADER_SIZE 30

struct alt_base
{
Expand Down Expand Up @@ -57,7 +56,6 @@ struct walker_data {
const char *url;
int got_alternates;
struct alt_base *alt;
struct curl_slist *no_pragma_header;
};

static struct object_request *object_queue_head;
Expand Down Expand Up @@ -108,7 +106,6 @@ static void start_object_request(struct walker *walker,
char range[RANGE_HEADER_SIZE];
struct curl_slist *range_header = NULL;
struct active_request_slot *slot;
struct walker_data *data = walker->data;

snprintf(prevfile, sizeof(prevfile), "%s.prev", obj_req->filename);
unlink_or_warn(prevfile);
Expand Down Expand Up @@ -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_ERRORBUFFER, obj_req->errorstr);
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
Expand Down Expand Up @@ -354,6 +351,8 @@ static void prefetch(struct walker *walker, unsigned char *sha1)
newreq->slot = NULL;
newreq->next = NULL;

http_is_verbose = walker->get_verbosely;

if (object_queue_head == NULL) {
object_queue_head = newreq;
} else {
Expand All @@ -379,7 +378,6 @@ static int fetch_index(struct walker *walker, struct alt_base *repo, unsigned ch
long prev_posn = 0;
char range[RANGE_HEADER_SIZE];
struct curl_slist *range_header = NULL;
struct walker_data *data = walker->data;

FILE *indexfile;
struct active_request_slot *slot;
Expand Down Expand Up @@ -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_WRITEFUNCTION, fwrite);
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;

/*
Expand Down Expand Up @@ -768,7 +766,6 @@ static int fetch_pack(struct walker *walker, struct alt_base *repo, unsigned cha
long prev_posn = 0;
char range[RANGE_HEADER_SIZE];
struct curl_slist *range_header = NULL;
struct walker_data *data = walker->data;

struct active_request_slot *slot;
struct slot_results results;
Expand Down Expand Up @@ -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_WRITEFUNCTION, fwrite);
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;

/*
Expand Down Expand Up @@ -948,10 +945,7 @@ static int fetch_ref(struct walker *walker, struct ref *ref)

static void cleanup(struct walker *walker)
{
struct walker_data *data = walker->data;
http_cleanup();

curl_slist_free_all(data->no_pragma_header);
}

struct walker *get_http_walker(const char *url, struct remote *remote)
Expand All @@ -962,8 +956,6 @@ struct walker *get_http_walker(const char *url, struct remote *remote)

http_init(remote);

data->no_pragma_header = curl_slist_append(NULL, "Pragma:");

data->alt = xmalloc(sizeof(*data->alt));
data->alt->base = xmalloc(strlen(url) + 1);
strcpy(data->alt->base, url);
Expand Down
9 changes: 9 additions & 0 deletions http.c
View file
Expand Up @@ -2,6 +2,7 @@

int data_received;
int active_requests;
int http_is_verbose;

#ifdef USE_CURL_MULTI
static int max_requests = -1;
Expand Down Expand Up @@ -29,6 +30,8 @@ static char *user_name, *user_pass;

static struct curl_slist *pragma_header;

struct curl_slist *no_pragma_header;

static struct active_request_slot *active_queue_head;

size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
Expand Down Expand Up @@ -276,6 +279,8 @@ void http_init(struct remote *remote)
char *low_speed_limit;
char *low_speed_time;

http_is_verbose = 0;

git_config(http_options, NULL);

curl_global_init(CURL_GLOBAL_ALL);
Expand All @@ -284,6 +289,7 @@ void http_init(struct remote *remote)
curl_http_proxy = xstrdup(remote->http_proxy);

pragma_header = curl_slist_append(pragma_header, "Pragma: no-cache");
no_pragma_header = curl_slist_append(no_pragma_header, "Pragma:");

#ifdef USE_CURL_MULTI
{
Expand Down Expand Up @@ -366,6 +372,9 @@ void http_cleanup(void)
curl_slist_free_all(pragma_header);
pragma_header = NULL;

curl_slist_free_all(no_pragma_header);
no_pragma_header = NULL;

if (curl_http_proxy) {
free((void *)curl_http_proxy);
curl_http_proxy = NULL;
Expand Down
5 changes: 5 additions & 0 deletions http.h
View file
Expand Up @@ -88,11 +88,16 @@ extern void add_fill_function(void *data, int (*fill)(void *));
extern void step_active_slots(void);
#endif

extern struct curl_slist *no_pragma_header;

#define RANGE_HEADER_SIZE 30

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 char curl_errorstr[CURL_ERROR_SIZE];

Expand Down

0 comments on commit e917674

Please sign in to comment.