X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=http.h;h=69b6b667d956933eca7153b51867493d7271df0b;hb=b4b20b2164e433fead84beb526b713a889fc31df;hp=ed4ea3340e48307e087a311136d1fe4f74b2d607;hpb=302ebfe52192fff9a2c1c612dff22325fd073acc;p=git.git diff --git a/http.h b/http.h index ed4ea3340..69b6b667d 100644 --- a/http.h +++ b/http.h @@ -6,7 +6,7 @@ #include #include -#if LIBCURL_VERSION_NUM >= 0x070908 +#if LIBCURL_VERSION_NUM >= 0x071000 #define USE_CURL_MULTI #define DEFAULT_MAX_REQUESTS 5 #endif @@ -18,10 +18,20 @@ #define curl_global_init(a) do { /* nothing */ } while(0) #endif -#if LIBCURL_VERSION_NUM < 0x070c04 +#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; @@ -29,6 +39,8 @@ struct active_request_slot 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; @@ -54,6 +66,7 @@ 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);