summaryrefslogtreecommitdiff
path: root/lib/pingpong.h
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-12-14 09:21:47 +0100
committerDaniel Stenberg <daniel@haxx.se>2018-12-17 12:33:00 +0100
commit154a17b6ee5097642e2330fb14ba52e317b95430 (patch)
tree51aa928bc4a5cecee4cde482e54ad89c5c080baf /lib/pingpong.h
parent9e6518481cd4e2603b4f9e04d6cfd1a214a72726 (diff)
downloadcurl-154a17b6ee5097642e2330fb14ba52e317b95430.tar.gz
pingpong: ignore regular timeout in disconnect phase
The timeout set with CURLOPT_TIMEOUT is no longer used when disconnecting from one of the pingpong protocols (FTP, IMAP, SMTP, POP3). Reported-by: jasal82 on github Fixes #3264 Closes #3374
Diffstat (limited to 'lib/pingpong.h')
-rw-r--r--lib/pingpong.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/pingpong.h b/lib/pingpong.h
index 5ac8df876..dbe1f8d3d 100644
--- a/lib/pingpong.h
+++ b/lib/pingpong.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -81,14 +81,15 @@ struct pingpong {
* called repeatedly until done. Set 'wait' to make it wait a while on the
* socket if there's no traffic.
*/
-CURLcode Curl_pp_statemach(struct pingpong *pp, bool block);
+CURLcode Curl_pp_statemach(struct pingpong *pp, bool block,
+ bool disconnecting);
/* initialize stuff to prepare for reading a fresh new response */
void Curl_pp_init(struct pingpong *pp);
/* Returns timeout in ms. 0 or negative number means the timeout has already
triggered */
-time_t Curl_pp_state_timeout(struct pingpong *pp);
+time_t Curl_pp_state_timeout(struct pingpong *pp, bool disconnecting);
/***********************************************************************