diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-27 15:58:44 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-27 15:58:44 -0500 |
| commit | f9f5957884c279af81766f3f339bdd0e768e814f (patch) | |
| tree | 310f21f037896ac658f8d59e81fa671ee9dee1ef /Utilities/cmcurl/lib/pingpong.c | |
| parent | 39dcf9469d3dae1c319dbe9d1fbd86bef91b73e0 (diff) | |
| parent | dac458ddbf2b48168779821654a7e69cbd828c14 (diff) | |
| download | cmake-f9f5957884c279af81766f3f339bdd0e768e814f.tar.gz | |
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2022-12-21 (c12fb3dd)
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 |