diff options
author | Brad King <brad.king@kitware.com> | 2016-12-06 14:26:20 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-06 14:26:20 (GMT) |
commit | 0290bfc35dee73fb534556700554536f1164caaf (patch) | |
tree | fd32adb3acbcc1a0f7495f23b8a96bb9e5d392e9 /Utilities/cmcurl/lib/pingpong.c | |
parent | 22f05b1d8c8c52babe62ab44e6f1864aa73164a0 (diff) | |
parent | df7fa47c1b42a360158f0b8596d177998fd4fa2d (diff) | |
download | CMake-0290bfc35dee73fb534556700554536f1164caaf.zip CMake-0290bfc35dee73fb534556700554536f1164caaf.tar.gz CMake-0290bfc35dee73fb534556700554536f1164caaf.tar.bz2 |
Merge topic 'update-curl'
df7fa47c curl: Disable symbol hiding logic in build for CMake
f8a1ba20 Merge branch 'upstream-curl' into update-curl
93cc249f curl 2016-11-02 (3c561c65)
25d7b1ca curl: Update script to get curl 7.51.0
Diffstat (limited to 'Utilities/cmcurl/lib/pingpong.c')
-rw-r--r-- | Utilities/cmcurl/lib/pingpong.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Utilities/cmcurl/lib/pingpong.c b/Utilities/cmcurl/lib/pingpong.c index 92ff84b..bf2c8fd 100644 --- a/Utilities/cmcurl/lib/pingpong.c +++ b/Utilities/cmcurl/lib/pingpong.c @@ -108,7 +108,8 @@ CURLcode Curl_pp_statemach(struct pingpong *pp, bool block) /* We are receiving and there is data ready in the SSL library */ rc = 1; else - rc = Curl_socket_ready(pp->sendleft?CURL_SOCKET_BAD:sock, /* reading */ + rc = Curl_socket_check(pp->sendleft?CURL_SOCKET_BAD:sock, /* reading */ + CURL_SOCKET_BAD, pp->sendleft?sock:CURL_SOCKET_BAD, /* writing */ interval_ms); |