moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

urldata: remove duplicate 'upkeep_interval_ms' from connectdata 

... and rely only on the value already set in Curl_easy.

Closes #6534
This commit is contained in:
Daniel Stenberg 2021-01-26 14:23:36 +01:00
parent d6a37c23a3
commit 1c3def53c7
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/http2.c
View File

@ -229,7 +229,7 @@ static unsigned int http2_conncheck(struct Curl_easy *data,
struct curltime now = Curl_now();
timediff_t elapsed = Curl_timediff(now, conn->keepalive);
if(elapsed > conn->upkeep_interval_ms) {
if(elapsed > data->set.upkeep_interval_ms) {
/* Perform an HTTP/2 PING */
rc = nghttp2_submit_ping(c->h2, 0, ZERO_NULL);
if(!rc) {

3
lib/url.c
View File

@ -1674,9 +1674,6 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
/* Store current time to give a baseline to keepalive connection times. */
conn->keepalive = Curl_now();
/* Store off the configured connection upkeep time. */
conn->upkeep_interval_ms = data->set.upkeep_interval_ms;
conn->data = data; /* Setup the association between this connection
and the Curl_easy */

2
lib/urldata.h
View File

@ -1034,8 +1034,6 @@ struct connectdata {
was used on this connection. */
struct curltime keepalive;
long upkeep_interval_ms; /* Time between calls for connection upkeep. */
/**** curl_get() phase fields */
curl_socket_t sockfd; /* socket to read from or CURL_SOCKET_BAD */