diff options
| author | Christian Grothoff <christian@grothoff.org> | 2024-01-08 19:22:00 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2024-01-08 19:22:06 +0100 |
| commit | 84b7ef357a50bafc2480a3f696e33e073fa65cde (patch) | |
| tree | 6abfe8a4b0a239ff3dca765a815797741bfca5a3 /src/lib | |
| parent | e8460651653a1e5ec7ee3fcb6f2724b1732c6a5a (diff) | |
| download | merchant-84b7ef357a50bafc2480a3f696e33e073fa65cde.tar.gz merchant-84b7ef357a50bafc2480a3f696e33e073fa65cde.tar.bz2 merchant-84b7ef357a50bafc2480a3f696e33e073fa65cde.zip | |
improve curl backwards compatibility, de-duplicate code
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/merchant_api_curl_defaults.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/lib/merchant_api_curl_defaults.c b/src/lib/merchant_api_curl_defaults.c index d565e5dd..710b3830 100644 --- a/src/lib/merchant_api_curl_defaults.c +++ b/src/lib/merchant_api_curl_defaults.c @@ -38,33 +38,14 @@ TALER_MERCHANT_curl_easy_get_ (const char *url) curl_easy_setopt (eh, CURLOPT_URL, url)); - GNUNET_assert (CURLE_OK == - curl_easy_setopt (eh, - CURLOPT_FOLLOWLOCATION, - 1L)); - if (0 == strcasecmp (url, - "https://")) - GNUNET_assert (CURLE_OK == - curl_easy_setopt (eh, - CURLOPT_REDIR_PROTOCOLS_STR, - "https")); - else - GNUNET_assert (CURLE_OK == - curl_easy_setopt (eh, - CURLOPT_REDIR_PROTOCOLS_STR, - "http,https")); + TALER_curl_set_secure_redirect_policy (eh, + url); /* Enable compression (using whatever curl likes), see https://curl.se/libcurl/c/CURLOPT_ACCEPT_ENCODING.html */ GNUNET_break (CURLE_OK == curl_easy_setopt (eh, CURLOPT_ACCEPT_ENCODING, "")); - /* limit MAXREDIRS to 5 as a simple security measure against - a potential infinite loop caused by a malicious target */ - GNUNET_assert (CURLE_OK == - curl_easy_setopt (eh, - CURLOPT_MAXREDIRS, - 5L)); GNUNET_assert (CURLE_OK == curl_easy_setopt (eh, CURLOPT_TCP_FASTOPEN, |