diff options
| author | Curl Upstream <curl-library@cool.haxx.se> | 2016-12-22 15:41:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-07 16:37:30 (GMT) |
| commit | 4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab (patch) | |
| tree | ef3a36a4eb9b0c43881db54e61574378e104b936 /lib/pingpong.c | |
| parent | 93cc249f3dd7ecd621cd063e4c08bbdb54d971e8 (diff) | |
| download | CMake-4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab.zip CMake-4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab.tar.gz CMake-4cc2908fdaaf1ab8afe5c2ae5dbb3401859a9aab.tar.bz2 | |
curl 2016-12-22 (44b9b4d4)
Code extracted from:
https://github.com/curl/curl.git
at commit 44b9b4d4f56d6f6de92c89636994c03984e9cd01 (curl-7_52_1).
Diffstat (limited to 'lib/pingpong.c')
| -rw-r--r-- | lib/pingpong.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/pingpong.c b/lib/pingpong.c index bf2c8fd..7a99357 100644 --- a/lib/pingpong.c +++ b/lib/pingpong.c @@ -44,12 +44,12 @@ /* Returns timeout in ms. 0 or negative number means the timeout has already triggered */ -long Curl_pp_state_timeout(struct pingpong *pp) +time_t Curl_pp_state_timeout(struct pingpong *pp) { struct connectdata *conn = pp->conn; struct Curl_easy *data=conn->data; - long timeout_ms; /* in milliseconds */ - long timeout2_ms; /* in milliseconds */ + time_t timeout_ms; /* in milliseconds */ + time_t timeout2_ms; /* in milliseconds */ long response_time= (data->set.server_response_timeout)? data->set.server_response_timeout: pp->response_time; @@ -83,8 +83,8 @@ CURLcode Curl_pp_statemach(struct pingpong *pp, bool block) struct connectdata *conn = pp->conn; curl_socket_t sock = conn->sock[FIRSTSOCKET]; int rc; - long interval_ms; - long timeout_ms = Curl_pp_state_timeout(pp); + time_t interval_ms; + time_t timeout_ms = Curl_pp_state_timeout(pp); struct Curl_easy *data=conn->data; CURLcode result = CURLE_OK; @@ -101,7 +101,9 @@ CURLcode Curl_pp_statemach(struct pingpong *pp, bool block) else interval_ms = 0; /* immediate */ - if(Curl_pp_moredata(pp)) + if(Curl_ssl_data_pending(conn, 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)) |