diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-14 15:51:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-14 15:51:44 +0000 |
| commit | 9aa1a64cabedcc41f8be6608e0ee872b56c454a3 (patch) | |
| tree | 2c3eab943845aec3b36d6ea0e33ce0f5cc412033 /lib/getinfo.c | |
| parent | 0c66739b05f29c81b6a0a6814929e1e6a51c6995 (diff) | |
| parent | d82935bad8787715114b546d997bc3e494fb63cc (diff) | |
| download | external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.tar.gz external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.tar.bz2 external_curl-9aa1a64cabedcc41f8be6608e0ee872b56c454a3.zip | |
Merge "Upgrade curl to curl-7_71_1" am: 23abcba889 am: d82935bad8
Original change: https://android-review.googlesource.com/c/platform/external/curl/+/1360986
Change-Id: If39a57f7925d048081295b1d981399e38ac55e22
Diffstat (limited to 'lib/getinfo.c')
| -rw-r--r-- | lib/getinfo.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/getinfo.c b/lib/getinfo.c index 84d9fc1c..6d5bd5fc 100644 --- a/lib/getinfo.c +++ b/lib/getinfo.c @@ -198,9 +198,11 @@ static CURLcode getinfo_long(struct Curl_easy *data, CURLINFO info, case CURLINFO_SSL_VERIFYRESULT: *param_longp = data->set.ssl.certverifyresult; break; +#ifndef CURL_DISABLE_PROXY case CURLINFO_PROXY_SSL_VERIFYRESULT: *param_longp = data->set.proxy_ssl.certverifyresult; break; +#endif case CURLINFO_REDIRECT_COUNT: *param_longp = data->set.followlocation; break; @@ -320,7 +322,7 @@ static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info, *param_offt = data->progress.downloaded; break; case CURLINFO_SPEED_DOWNLOAD_T: - *param_offt = data->progress.dlspeed; + *param_offt = data->progress.dlspeed; break; case CURLINFO_SPEED_UPLOAD_T: *param_offt = data->progress.ulspeed; @@ -408,13 +410,13 @@ static CURLcode getinfo_double(struct Curl_easy *data, CURLINFO info, *param_doublep = DOUBLE_SECS(data->progress.t_starttransfer); break; case CURLINFO_SIZE_UPLOAD: - *param_doublep = (double)data->progress.uploaded; + *param_doublep = (double)data->progress.uploaded; break; case CURLINFO_SIZE_DOWNLOAD: *param_doublep = (double)data->progress.downloaded; break; case CURLINFO_SPEED_DOWNLOAD: - *param_doublep = (double)data->progress.dlspeed; + *param_doublep = (double)data->progress.dlspeed; break; case CURLINFO_SPEED_UPLOAD: *param_doublep = (double)data->progress.ulspeed; |