mirror of
https://github.com/curl/curl.git
synced 2026-04-14 21:41:41 +03:00
parent
4c6b74e1e8
commit
217fd5b424
9 changed files with 11 additions and 11 deletions
|
|
@ -3182,7 +3182,7 @@ static CURLMcode multi_timeout(struct Curl_multi *multi,
|
|||
|
||||
/* splay the lowest to the bottom */
|
||||
multi->timetree = Curl_splay(tv_zero, multi->timetree);
|
||||
/* this will not return NULL from a non-emtpy tree, but some compilers
|
||||
/* this will not return NULL from a non-empty tree, but some compilers
|
||||
* are not convinced of that. Analyzers are hard. */
|
||||
*expire_time = multi->timetree ? multi->timetree->key : tv_zero;
|
||||
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ static CURLMcode mev_pollset_diff(struct Curl_multi *multi,
|
|||
CURLMcode mresult;
|
||||
|
||||
/* The transfer `data` reports in `ps` the sockets it is interested
|
||||
* in and which combinatino of CURL_POLL_IN/CURL_POLL_OUT it wants
|
||||
* in and which combination of CURL_POLL_IN/CURL_POLL_OUT it wants
|
||||
* to have monitored for events.
|
||||
* There can be more than 1 transfer interested in the same socket
|
||||
* and 1 transfer might be interested in more than 1 socket.
|
||||
|
|
|
|||
|
|
@ -483,7 +483,7 @@ static CURLcode smtp_perform_upgrade_tls(struct Curl_easy *data,
|
|||
result, ssldone));
|
||||
if(!result && ssldone) {
|
||||
smtpc->ssldone = ssldone;
|
||||
/* perform EHLO now, changes smpt->state out of SMTP_UPGRADETLS */
|
||||
/* perform EHLO now, changes smtp->state out of SMTP_UPGRADETLS */
|
||||
result = smtp_perform_ehlo(data, smtpc);
|
||||
}
|
||||
out:
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ struct uint_tbl {
|
|||
void **rows; /* array of void* holding entries */
|
||||
Curl_uint_tbl_entry_dtor *entry_dtor;
|
||||
unsigned int nrows; /* length of `rows` array */
|
||||
unsigned int nentries; /* entris in table */
|
||||
unsigned int nentries; /* entries in table */
|
||||
unsigned int last_key_added; /* UINT_MAX or last key added */
|
||||
#ifdef DEBUGBUILD
|
||||
int init;
|
||||
|
|
|
|||
|
|
@ -1135,7 +1135,7 @@ static bool url_match_destination(struct connectdata *conn,
|
|||
/* We are in an IMAPS vs IMAP like case. We expect `conn` to have SSL */
|
||||
if(!Curl_conn_is_ssl(conn, FIRSTSOCKET)) {
|
||||
DEBUGF(infof(m->data,
|
||||
"Connection #%" FMT_OFF_T " has compatible protocol famiy, "
|
||||
"Connection #%" FMT_OFF_T " has compatible protocol family, "
|
||||
"but no SSL, no match", conn->connection_id));
|
||||
return FALSE;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2370,7 +2370,7 @@ static CURLcode cf_osslq_query(struct Curl_cfilter *cf,
|
|||
#else
|
||||
*pres1 = 100;
|
||||
#endif
|
||||
CURL_TRC_CF(data, cf, "query max_conncurrent -> %d", *pres1);
|
||||
CURL_TRC_CF(data, cf, "query max_concurrent -> %d", *pres1);
|
||||
return CURLE_OK;
|
||||
}
|
||||
case CF_QUERY_CONNECT_REPLY_MS:
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ options:
|
|||
CURLOPT_SSLKEYTYPE
|
||||
CURLOPT_SSL_CIPHER_LIST
|
||||
CURLOPT_SSL_EC_CURVES
|
||||
CURLOPT_SSL_SIGNATURE_ALGORIHMS
|
||||
CURLOPT_SSL_SIGNATURE_ALGORITHMS
|
||||
CURLOPT_TLS13_CIPHERS
|
||||
CURLOPT_TLSAUTH_PASSWORD
|
||||
CURLOPT_TLSAUTH_TYPE
|
||||
|
|
@ -269,7 +269,7 @@ _ As a prerequisite, QADRT development environment must be installed.
|
|||
_ If data compression has to be supported, ZLIB development environment must
|
||||
be installed.
|
||||
_ Likewise, if SCP and SFTP protocols have to be compiled in, LIBSSH2
|
||||
developent environment must be installed.
|
||||
development environment must be installed.
|
||||
_ Install the curl source directory in IFS. Do NOT install it in the
|
||||
installation target directory (which defaults to /curl).
|
||||
_ Enter Qshell (QSH, not PASE)
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ class TestBasic:
|
|||
r.check_stats(http_status=200, count=1, exitcode=0,
|
||||
remote_port=env.port_for(alpn_proto=proto),
|
||||
remote_ip='127.0.0.1')
|
||||
# got the Conten-Length: header, but did not download anything
|
||||
# got the Content-Length: header, but did not download anything
|
||||
assert r.responses[0]['header']['content-length'] == '30', f'{r.responses[0]}'
|
||||
assert r.stats[0]['size_download'] == 0, f'{r.stats[0]}'
|
||||
|
||||
|
|
@ -149,7 +149,7 @@ class TestBasic:
|
|||
# http: large response headers
|
||||
# send 48KB+ sized response headers to check we handle that correctly
|
||||
# larger than 64KB headers expose a bug in Apache HTTP/2 that is not
|
||||
# RSTing the stream correclty when its internal limits are exceeded.
|
||||
# RSTing the stream correctly when its internal limits are exceeded.
|
||||
@pytest.mark.parametrize("proto", ['http/1.1', 'h2', 'h3'])
|
||||
def test_01_11_large_resp_headers(self, env: Env, httpd, proto):
|
||||
if proto == 'h3' and not env.have_h3():
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ class TestProxy:
|
|||
indata = open(srcfile).readlines()
|
||||
for i in range(count):
|
||||
respdata = open(curl.response_file(i)).readlines()
|
||||
assert respdata == indata, f'resonse {i} differs'
|
||||
assert respdata == indata, f'response {i} differs'
|
||||
assert r.total_connects == 1, r.dump_logs()
|
||||
|
||||
@pytest.mark.skipif(condition=not Env.have_ssl_curl(), reason="curl without SSL")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue