Merge branch 'js/diffstat' into next

diff --git a/http.h b/http.h
index ed4ea3340e48307e087a311136d1fe4f74b2d607..9ca16acec25e3925c36bbade09b2cb7b4aa07842 100644 (file)
--- a/http.h
+++ b/http.h
@@ -22,6 +22,12 @@
 #define NO_CURL_EASY_DUPHANDLE
 #endif
 
+struct slot_results
+{
+       CURLcode curl_result;
+       long http_code;
+};
+
 struct active_request_slot
 {
        CURL *curl;
@@ -29,6 +35,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 +62,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);