mirror of
https://github.com/git/git.git
synced 2024-11-15 05:33:04 +01:00
9fc6440d78
In transport.c, proxy setting (the one from the remote conf) was set through curl_easy_setopt() call, while http.c already does the same with the http.proxy setting. We now just use this infrastructure instead, and make http_init() now take the struct remote as argument so that it can take the http_proxy setting from there, and any other property that would be added later. At the same time, we make get_http_walker() take a struct remote argument too, and pass it to http_init(), which makes remote defined proxy be used for more than get_refs_via_curl(). We leave out http-fetch and http-push, which don't use remotes for the moment, purposefully. Signed-off-by: Mike Hommey <mh@glandium.org> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
110 lines
2.7 KiB
C
110 lines
2.7 KiB
C
#ifndef HTTP_H
|
|
#define HTTP_H
|
|
|
|
#include "cache.h"
|
|
|
|
#include <curl/curl.h>
|
|
#include <curl/easy.h>
|
|
|
|
#include "strbuf.h"
|
|
#include "remote.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
|
|
|
|
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(void *ptr, size_t eltsize, size_t nmemb,
|
|
struct buffer *buffer);
|
|
extern size_t fwrite_buffer(const void *ptr, size_t eltsize,
|
|
size_t nmemb, struct strbuf *buffer);
|
|
extern size_t fwrite_null(const void *ptr, size_t eltsize,
|
|
size_t nmemb, struct strbuf *buffer);
|
|
|
|
/* 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_all_active_slots(void);
|
|
extern void release_active_slot(struct active_request_slot *slot);
|
|
|
|
#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 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)
|
|
|
|
extern int http_fetch_ref(const char *base, const char *ref, unsigned char *sha1);
|
|
|
|
#endif /* HTTP_H */
|