diff options
| author | dartraiden <wowemuh@gmail.com> | 2018-06-01 22:53:12 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2018-06-01 23:14:03 +0300 |
| commit | 2a7aa481eaf81a71e5c5682974fffe1aa1fc6202 (patch) | |
| tree | 4df2f855b4235490e9b63f89927784fd4ea3220a /libs/libcurl/src/non-ascii.c | |
| parent | df32d54d3b04bd5b4cfdc550b0d8b01fc12a7c15 (diff) | |
libs/libcurl: update to 7.60
Diffstat (limited to 'libs/libcurl/src/non-ascii.c')
| -rw-r--r-- | libs/libcurl/src/non-ascii.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libs/libcurl/src/non-ascii.c b/libs/libcurl/src/non-ascii.c index 92b2f8d732..14143248fb 100644 --- a/libs/libcurl/src/non-ascii.c +++ b/libs/libcurl/src/non-ascii.c @@ -30,6 +30,7 @@ #include "formdata.h" #include "sendf.h" #include "urldata.h" +#include "multiif.h" #include "curl_memory.h" /* The last #include file should be: */ @@ -84,7 +85,10 @@ CURLcode Curl_convert_to_network(struct Curl_easy *data, { if(data && data->set.convtonetwork) { /* use translation callback */ - CURLcode result = data->set.convtonetwork(buffer, length); + CURLcode result; + Curl_set_in_callback(data, true); + result = data->set.convtonetwork(buffer, length); + Curl_set_in_callback(data, false); if(result) { failf(data, "CURLOPT_CONV_TO_NETWORK_FUNCTION callback returned %d: %s", @@ -147,7 +151,10 @@ CURLcode Curl_convert_from_network(struct Curl_easy *data, { if(data && data->set.convfromnetwork) { /* use translation callback */ - CURLcode result = data->set.convfromnetwork(buffer, length); + CURLcode result; + Curl_set_in_callback(data, true); + result = data->set.convfromnetwork(buffer, length); + Curl_set_in_callback(data, false); if(result) { failf(data, "CURLOPT_CONV_FROM_NETWORK_FUNCTION callback returned %d: %s", @@ -210,7 +217,10 @@ CURLcode Curl_convert_from_utf8(struct Curl_easy *data, { if(data && data->set.convfromutf8) { /* use translation callback */ - CURLcode result = data->set.convfromutf8(buffer, length); + CURLcode result; + Curl_set_in_callback(data, true); + result = data->set.convfromutf8(buffer, length); + Curl_set_in_callback(data, false); if(result) { failf(data, "CURLOPT_CONV_FROM_UTF8_FUNCTION callback returned %d: %s", |