parent
de07d804fb
commit
11708d6f00
@ -341,7 +341,7 @@ void Curl_conncontrol(struct connectdata *conn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* job walking the matching addr infos, createing a sub-cfilter with the
|
* job walking the matching addr infos, creating a sub-cfilter with the
|
||||||
* provided method `cf_create` and running setup/connect on it.
|
* provided method `cf_create` and running setup/connect on it.
|
||||||
*/
|
*/
|
||||||
struct eyeballer {
|
struct eyeballer {
|
||||||
|
|||||||
@ -89,7 +89,7 @@ void Curl_conncontrol(struct connectdata *conn,
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a cfilter for making an "ip" connection to the
|
* Create a cfilter for making an "ip" connection to the
|
||||||
* given address, using paramters from `conn`. The "ip" connection
|
* given address, using parameters from `conn`. The "ip" connection
|
||||||
* can be a TCP socket, a UDP socket or even a QUIC connection.
|
* can be a TCP socket, a UDP socket or even a QUIC connection.
|
||||||
*
|
*
|
||||||
* It MUST use only the supplied `ai` for its connection attempt.
|
* It MUST use only the supplied `ai` for its connection attempt.
|
||||||
|
|||||||
@ -286,7 +286,7 @@ static CURLcode AcceptServerConnect(struct Curl_easy *data)
|
|||||||
conn->bits.do_more = FALSE;
|
conn->bits.do_more = FALSE;
|
||||||
|
|
||||||
(void)curlx_nonblock(s, TRUE); /* enable non-blocking */
|
(void)curlx_nonblock(s, TRUE); /* enable non-blocking */
|
||||||
/* Replace any filter on SECONDARY with one listeing on this socket */
|
/* Replace any filter on SECONDARY with one listening on this socket */
|
||||||
result = Curl_conn_tcp_accepted_set(data, conn, SECONDARYSOCKET, &s);
|
result = Curl_conn_tcp_accepted_set(data, conn, SECONDARYSOCKET, &s);
|
||||||
if(result)
|
if(result)
|
||||||
return result;
|
return result;
|
||||||
@ -1252,7 +1252,7 @@ static CURLcode ftp_state_use_port(struct Curl_easy *data,
|
|||||||
/* store which command was sent */
|
/* store which command was sent */
|
||||||
ftpc->count1 = fcmd;
|
ftpc->count1 = fcmd;
|
||||||
|
|
||||||
/* Replace any filter on SECONDARY with one listeing on this socket */
|
/* Replace any filter on SECONDARY with one listening on this socket */
|
||||||
result = Curl_conn_tcp_listen_set(data, conn, SECONDARYSOCKET, &portsock);
|
result = Curl_conn_tcp_listen_set(data, conn, SECONDARYSOCKET, &portsock);
|
||||||
if(result)
|
if(result)
|
||||||
goto out;
|
goto out;
|
||||||
|
|||||||
@ -67,7 +67,7 @@ class TestGoAway:
|
|||||||
r.check_responses(count=count, exp_status=200)
|
r.check_responses(count=count, exp_status=200)
|
||||||
assert len(r.stats) == count, f'{r.stats}'
|
assert len(r.stats) == count, f'{r.stats}'
|
||||||
# reload will shut down the connection gracefully with GOAWAY
|
# reload will shut down the connection gracefully with GOAWAY
|
||||||
# we expect to see a second connetion opened afterwards
|
# we expect to see a second connection opened afterwards
|
||||||
assert r.total_connects == 2
|
assert r.total_connects == 2
|
||||||
for idx, s in enumerate(r.stats):
|
for idx, s in enumerate(r.stats):
|
||||||
if s['num_connects'] > 0:
|
if s['num_connects'] > 0:
|
||||||
@ -102,7 +102,7 @@ class TestGoAway:
|
|||||||
r.check_responses(count=count, exp_status=200)
|
r.check_responses(count=count, exp_status=200)
|
||||||
assert len(r.stats) == count, f'{r.stats}'
|
assert len(r.stats) == count, f'{r.stats}'
|
||||||
# reload will shut down the connection gracefully with GOAWAY
|
# reload will shut down the connection gracefully with GOAWAY
|
||||||
# we expect to see a second connetion opened afterwards
|
# we expect to see a second connection opened afterwards
|
||||||
assert r.total_connects == 2
|
assert r.total_connects == 2
|
||||||
for idx, s in enumerate(r.stats):
|
for idx, s in enumerate(r.stats):
|
||||||
if s['num_connects'] > 0:
|
if s['num_connects'] > 0:
|
||||||
|
|||||||
@ -54,7 +54,7 @@ class TestStuttered:
|
|||||||
r.check_responses(count=1, exp_status=200)
|
r.check_responses(count=1, exp_status=200)
|
||||||
|
|
||||||
# download 50 files in 100 chunks a 100 bytes with 10ms delay between
|
# download 50 files in 100 chunks a 100 bytes with 10ms delay between
|
||||||
# prepend 100 file requests to warm up connection procesing limits
|
# prepend 100 file requests to warm up connection processing limits
|
||||||
# (Apache2 increases # of parallel processed requests after successes)
|
# (Apache2 increases # of parallel processed requests after successes)
|
||||||
@pytest.mark.parametrize("proto", ['h2', 'h3'])
|
@pytest.mark.parametrize("proto", ['h2', 'h3'])
|
||||||
def test_04_02_100_100_10(self, env: Env,
|
def test_04_02_100_100_10(self, env: Env,
|
||||||
@ -78,7 +78,7 @@ class TestStuttered:
|
|||||||
f'avg time of transfer: {t_avg} [{i_min}={t_min}, {i_max}={t_max}]'
|
f'avg time of transfer: {t_avg} [{i_min}={t_min}, {i_max}={t_max}]'
|
||||||
|
|
||||||
# download 50 files in 1000 chunks a 10 bytes with 1ms delay between
|
# download 50 files in 1000 chunks a 10 bytes with 1ms delay between
|
||||||
# prepend 100 file requests to warm up connection procesing limits
|
# prepend 100 file requests to warm up connection processing limits
|
||||||
# (Apache2 increases # of parallel processed requests after successes)
|
# (Apache2 increases # of parallel processed requests after successes)
|
||||||
@pytest.mark.parametrize("proto", ['h2', 'h3'])
|
@pytest.mark.parametrize("proto", ['h2', 'h3'])
|
||||||
def test_04_03_1000_10_1(self, env: Env, httpd, nghttpx, repeat, proto):
|
def test_04_03_1000_10_1(self, env: Env, httpd, nghttpx, repeat, proto):
|
||||||
@ -101,7 +101,7 @@ class TestStuttered:
|
|||||||
f'avg time of transfer: {t_avg} [{i_min}={t_min}, {i_max}={t_max}]'
|
f'avg time of transfer: {t_avg} [{i_min}={t_min}, {i_max}={t_max}]'
|
||||||
|
|
||||||
# download 50 files in 10000 chunks a 1 byte with 10us delay between
|
# download 50 files in 10000 chunks a 1 byte with 10us delay between
|
||||||
# prepend 100 file requests to warm up connection procesing limits
|
# prepend 100 file requests to warm up connection processing limits
|
||||||
# (Apache2 increases # of parallel processed requests after successes)
|
# (Apache2 increases # of parallel processed requests after successes)
|
||||||
@pytest.mark.parametrize("proto", ['h2', 'h3'])
|
@pytest.mark.parametrize("proto", ['h2', 'h3'])
|
||||||
def test_04_04_1000_10_1(self, env: Env, httpd, nghttpx, repeat, proto):
|
def test_04_04_1000_10_1(self, env: Env, httpd, nghttpx, repeat, proto):
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user