mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
84bd19ffd4
In commit 0b3750b5c2 (released in 7.36.0) we fixed a timeout issue
but instead broke the timings.
To fix this, I introduce a new timestamp to use for the timeouts and
restored the previous timestamp and timestamp position so that the old
timer functionality is restored.
In addition to that, that change also broke connection timeouts for when
more than one connect was used (as it would then count the total time
from the first connect and not for the most recent one). Now
Curl_timeleft() has been modified so that it checks against different
start times depending on which timeout it checks.
Test 1303 is updated accordingly.
Bug: http://curl.haxx.se/mail/lib-2014-05/0147.html
Reported-by: Ryan Braud
147 lines
5.2 KiB
C
147 lines
5.2 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2014, 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
|
|
* are also available at http://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
#include "curlcheck.h"
|
|
|
|
#include "urldata.h"
|
|
#include "connect.h"
|
|
#include "memdebug.h" /* LAST include file */
|
|
|
|
static struct SessionHandle *data;
|
|
|
|
static CURLcode unit_setup( void )
|
|
{
|
|
data = curl_easy_init();
|
|
if (!data)
|
|
return CURLE_OUT_OF_MEMORY;
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void unit_stop( void )
|
|
{
|
|
curl_easy_cleanup(data);
|
|
}
|
|
|
|
/* BASE is just a define to make us fool around with decently large number so
|
|
that we aren't zero-based */
|
|
#define BASE 1000000
|
|
|
|
/* macro to set the pretended current time */
|
|
#define NOW(x,y) now.tv_sec = x; now.tv_usec = y
|
|
/* macro to set the millisecond based timeouts to use */
|
|
#define TIMEOUTS(x,y) data->set.timeout = x; data->set.connecttimeout = y
|
|
|
|
/*
|
|
* To test:
|
|
*
|
|
* 00/10/01/11 timeouts set
|
|
* 0/1 during connect
|
|
* T various values on the timeouts
|
|
* N various values of now
|
|
*/
|
|
|
|
struct timetest {
|
|
int now_s;
|
|
int now_us;
|
|
int timeout_ms;
|
|
int connecttimeout_ms;
|
|
bool connecting;
|
|
long result;
|
|
const char *comment;
|
|
};
|
|
|
|
UNITTEST_START
|
|
|
|
struct timeval now;
|
|
long timeout;
|
|
unsigned int i;
|
|
|
|
const struct timetest run[] = {
|
|
/* both timeouts set, not connecting */
|
|
{BASE + 4, 0, 10000, 8000, FALSE, 6000, "6 seconds should be left"},
|
|
{BASE + 4, 990000, 10000, 8000, FALSE, 5010, "5010 ms should be left"},
|
|
{BASE + 10, 0, 10000, 8000, FALSE, -1, "timeout is -1, expired"},
|
|
{BASE + 12, 0, 10000, 8000, FALSE, -2000, "-2000, overdue 2 seconds"},
|
|
|
|
/* both timeouts set, connecting */
|
|
{BASE + 4, 0, 10000, 8000, TRUE, 4000, "4 seconds should be left"},
|
|
{BASE + 4, 990000, 10000, 8000, TRUE, 3010, "3010 ms should be left"},
|
|
{BASE + 8, 0, 10000, 8000, TRUE, -1, "timeout is -1, expired"},
|
|
{BASE + 10, 0, 10000, 8000, TRUE, -2000, "-2000, overdue 2 seconds"},
|
|
|
|
/* no connect timeout set, not connecting */
|
|
{BASE + 4, 0, 10000, 0, FALSE, 6000, "6 seconds should be left"},
|
|
{BASE + 4, 990000, 10000, 0, FALSE, 5010, "5010 ms should be left"},
|
|
{BASE + 10, 0, 10000, 0, FALSE, -1, "timeout is -1, expired"},
|
|
{BASE + 12, 0, 10000, 0, FALSE, -2000, "-2000, overdue 2 seconds"},
|
|
|
|
/* no connect timeout set, connecting */
|
|
{BASE + 4, 0, 10000, 0, FALSE, 6000, "6 seconds should be left"},
|
|
{BASE + 4, 990000, 10000, 0, FALSE, 5010, "5010 ms should be left"},
|
|
{BASE + 10, 0, 10000, 0, FALSE, -1, "timeout is -1, expired"},
|
|
{BASE + 12, 0, 10000, 0, FALSE, -2000, "-2000, overdue 2 seconds"},
|
|
|
|
/* only connect timeout set, not connecting */
|
|
{BASE + 4, 0, 0, 10000, FALSE, 0, "no timeout active"},
|
|
{BASE + 4, 990000, 0, 10000, FALSE, 0, "no timeout active"},
|
|
{BASE + 10, 0, 0, 10000, FALSE, 0, "no timeout active"},
|
|
{BASE + 12, 0, 0, 10000, FALSE, 0, "no timeout active"},
|
|
|
|
/* only connect timeout set, connecting */
|
|
{BASE + 4, 0, 0, 10000, TRUE, 6000, "6 seconds should be left"},
|
|
{BASE + 4, 990000, 0, 10000, TRUE, 5010, "5010 ms should be left"},
|
|
{BASE + 10, 0, 0, 10000, TRUE, -1, "timeout is -1, expired"},
|
|
{BASE + 12, 0, 0, 10000, TRUE, -2000, "-2000, overdue 2 seconds"},
|
|
|
|
/* no timeout set, not connecting */
|
|
{BASE + 4, 0, 0, 0, FALSE, 0, "no timeout active"},
|
|
{BASE + 4, 990000, 0, 0, FALSE, 0, "no timeout active"},
|
|
{BASE + 10, 0, 0, 0, FALSE, 0, "no timeout active"},
|
|
{BASE + 12, 0, 0, 0, FALSE, 0, "no timeout active"},
|
|
|
|
/* no timeout set, connecting */
|
|
{BASE + 4, 0, 0, 0, TRUE, 296000, "no timeout active"},
|
|
{BASE + 4, 990000, 0, 0, TRUE, 295010, "no timeout active"},
|
|
{BASE + 10, 0, 0, 0, TRUE, 290000, "no timeout active"},
|
|
{BASE + 12, 0, 0, 0, TRUE, 288000, "no timeout active"},
|
|
|
|
/* both timeouts set, connecting, connect timeout the longer one */
|
|
{BASE + 4, 0, 10000, 12000, TRUE, 6000, "6 seconds should be left"},
|
|
|
|
};
|
|
|
|
/* this is the pretended start time of the transfer */
|
|
data->progress.t_startsingle.tv_sec = BASE;
|
|
data->progress.t_startsingle.tv_usec = 0;
|
|
data->progress.t_startop.tv_sec = BASE;
|
|
data->progress.t_startop.tv_usec = 0;
|
|
|
|
for(i=0; i < sizeof(run)/sizeof(run[0]); i++) {
|
|
NOW(run[i].now_s, run[i].now_us);
|
|
TIMEOUTS(run[i].timeout_ms, run[i].connecttimeout_ms);
|
|
timeout = Curl_timeleft(data, &now, run[i].connecting);
|
|
if(timeout != run[i].result)
|
|
fail(run[i].comment);
|
|
}
|
|
|
|
|
|
UNITTEST_STOP
|