mirror of
https://github.com/curl/curl.git
synced 2026-04-14 21:41:41 +03:00
pingpong: change repsonse timeout to one minute
It was previously two minutes by default and sometimes one minute. Removes a struct field. Closes #19254
This commit is contained in:
parent
6c97ff8c12
commit
2bb33c18a7
4 changed files with 3 additions and 12 deletions
|
|
@ -3364,15 +3364,9 @@ static CURLcode ftp_done(struct Curl_easy *data, CURLcode status,
|
|||
* data has been transferred. This happens when doing through NATs etc that
|
||||
* abandon old silent connections.
|
||||
*/
|
||||
timediff_t old_time = pp->response_time;
|
||||
|
||||
pp->response_time = 60*1000; /* give it only a minute for now */
|
||||
pp->response = curlx_now(); /* timeout relative now */
|
||||
|
||||
result = getftpresponse(data, &nread, &ftpcode);
|
||||
|
||||
pp->response_time = old_time; /* set this back to previous value */
|
||||
|
||||
if(!nread && (CURLE_OPERATION_TIMEDOUT == result)) {
|
||||
failf(data, "control connection looks dead");
|
||||
ftpc->ctl_valid = FALSE; /* mark control connection as bad */
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ timediff_t Curl_pp_state_timeout(struct Curl_easy *data,
|
|||
struct pingpong *pp, bool disconnecting)
|
||||
{
|
||||
timediff_t timeout_ms; /* in milliseconds */
|
||||
timediff_t response_time = (data->set.server_response_timeout > 0) ?
|
||||
data->set.server_response_timeout : pp->response_time;
|
||||
timediff_t response_time = data->set.server_response_timeout ?
|
||||
data->set.server_response_timeout : RESP_TIMEOUT;
|
||||
struct curltime now = curlx_now();
|
||||
|
||||
/* if CURLOPT_SERVER_RESPONSE_TIMEOUT is set, use that to determine
|
||||
|
|
|
|||
|
|
@ -53,8 +53,6 @@ struct pingpong {
|
|||
size_t sendsize; /* total size of the sendthis buffer */
|
||||
struct curltime response; /* set to Curl_now() when a command has been sent
|
||||
off, used to time-out response reading */
|
||||
timediff_t response_time; /* When no timeout is given, this is the amount of
|
||||
milliseconds we await for a server response. */
|
||||
struct dynbuf sendbuf;
|
||||
struct dynbuf recvbuf;
|
||||
size_t overflow; /* number of bytes left after a final response line */
|
||||
|
|
@ -75,7 +73,6 @@ struct pingpong {
|
|||
|
||||
#define PINGPONG_SETUP(pp,s,e) \
|
||||
do { \
|
||||
(pp)->response_time = RESP_TIMEOUT; \
|
||||
(pp)->statemachine = s; \
|
||||
(pp)->endofresp = e; \
|
||||
} while(0)
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ typedef unsigned int curl_prot_t;
|
|||
#define MAX_IPADR_LEN sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")
|
||||
|
||||
/* Default FTP/IMAP etc response timeout in milliseconds */
|
||||
#define RESP_TIMEOUT (120*1000)
|
||||
#define RESP_TIMEOUT (60*1000)
|
||||
|
||||
/* Max string input length is a precaution against abuse and to detect junk
|
||||
input easier and better. */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue