From 8fe15035d1d08e2e628be26f73044baa58e459c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Sun, 14 Nov 2021 11:10:43 +0800 Subject: One handle for every thread See libcurl-tutorial(3) manual page, "Handle the Easy libcurl". --- client.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'client.c') diff --git a/client.c b/client.c index b46f973..d7c8f70 100644 --- a/client.c +++ b/client.c @@ -1,8 +1,5 @@ #include #include -#ifndef __EMSCRIPTEN__ -#include -#endif #include "request.h" #include "icclient.h" @@ -11,7 +8,7 @@ char *image_dir; emscripten_fetch_attr_t attr; #else char *sampleurl; -CURL *curl; +char *cainfo = NULL; #endif extern void handle_results(icclient_response *); @@ -31,14 +28,10 @@ void icclient_init(const char *url, const char *dir, const char *certificate) if (append) strcat(sampleurl, "/"); curl_global_init(CURL_GLOBAL_SSL); - curl = curl_easy_init(); - curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); - curl_easy_setopt(curl, CURLOPT_COOKIEFILE, ""); - if (certificate) - curl_easy_setopt(curl, CURLOPT_CAINFO, certificate); -#ifdef DEBUG - curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); -#endif + if (certificate) { + cainfo = malloc(strlen(certificate) + 1); + strcpy(cainfo, certificate); + } #endif } @@ -98,6 +91,7 @@ void icclient_free_response(icclient_response *response) emscripten_fetch_close(response); #else free(response->data); + curl_easy_cleanup(response->curl); free(response); #endif } @@ -106,8 +100,8 @@ void icclient_cleanup() { free(image_dir); #ifndef __EMSCRIPTEN__ + free(cainfo); free(sampleurl); - curl_easy_cleanup(curl); curl_global_cleanup(); #endif } -- cgit v1.2.3