diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-31 14:13:15 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-01-31 09:13:24 -0500 |
| commit | 1a5bc71c59c75e66e280b3f3f6bf1727b0e21c39 (patch) | |
| tree | 53e9b7f3b2c51e2146500f550f51103df081ac6f /Utilities/cmcurl/lib/pingpong.c | |
| parent | 4dc058270d47316a7779e03ab8e60d75820a86f5 (diff) | |
| parent | 8443dfa94663531c8481611cc35b807c1cea2c75 (diff) | |
| download | cmake-1a5bc71c59c75e66e280b3f3f6bf1727b0e21c39.tar.gz | |
Merge topic 'update-curl'
8443dfa946 curl: Work around missing OpenSSL symbol on machine with LCC 1.23
f9f5957884 Merge branch 'upstream-curl' into update-curl
dac458ddbf curl 2022-12-21 (c12fb3dd)
39dcf9469d curl: Update script to get curl 7.87.0
b2fe717a49 file: Avoid using deprecated curl progress callback
1cd38de47f ctest: Drop unnecessary use of deprecated CURLOPT_PUT
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8131
Diffstat (limited to 'Utilities/cmcurl/lib/pingpong.c')
| -rw-r--r-- | Utilities/cmcurl/lib/pingpong.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Utilities/cmcurl/lib/pingpong.c b/Utilities/cmcurl/lib/pingpong.c index d4e6be98c4..9b9558048a 100644 --- a/Utilities/cmcurl/lib/pingpong.c +++ b/Utilities/cmcurl/lib/pingpong.c @@ -28,6 +28,7 @@ #include "curl_setup.h" #include "urldata.h" +#include "cfilters.h" #include "sendf.h" #include "select.h" #include "progress.h" @@ -102,12 +103,12 @@ CURLcode Curl_pp_statemach(struct Curl_easy *data, else interval_ms = 0; /* immediate */ - if(Curl_ssl_data_pending(conn, FIRSTSOCKET)) + if(Curl_conn_data_pending(data, FIRSTSOCKET)) rc = 1; else if(Curl_pp_moredata(pp)) /* We are receiving and there is data in the cache so just read it */ rc = 1; - else if(!pp->sendleft && Curl_ssl_data_pending(conn, FIRSTSOCKET)) + else if(!pp->sendleft && Curl_conn_data_pending(data, FIRSTSOCKET)) /* We are receiving and there is data ready in the SSL library */ rc = 1; else |