Reported-by: musvaage on github
Fixes #11171
Closes #11172
This commit is contained in:
Daniel Stenberg 2023-05-21 23:27:43 +02:00
Родитель 1561d06752
Коммит 127eb0d83a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 5CC908FDB71E12C2
28 изменённых файлов: 41 добавлений и 42 удалений

Просмотреть файл

@ -423,7 +423,7 @@ OpenSSL, follow the OpenSSL build instructions and then install `libssl.a` and
OpenSSL like this:
```bash
LIBS="-lssl -lcrypto -lc++" # For OpenSSL/BoringSSL. In general, you will need to the SSL/TLS layer's transtive dependencies if you are linking statically.
LIBS="-lssl -lcrypto -lc++" # For OpenSSL/BoringSSL. In general, you will need to the SSL/TLS layer's transitive dependencies if you are linking statically.
./configure --host aarch64-linux-android --with-pic --disable-shared --with-openssl="$TOOLCHAIN/sysroot/usr"
```

Просмотреть файл

@ -272,7 +272,7 @@ int main(int argc, char *argv[])
// Initialize CURL connection
if(!init(conn, argv[1])) {
fprintf(stderr, "Connection initializion failed\n");
fprintf(stderr, "Connection initialization failed\n");
exit(EXIT_FAILURE);
}

Просмотреть файл

@ -101,8 +101,8 @@ int main(int argc, char **argv)
/* now specify which file to upload */
curl_easy_setopt(curl, CURLOPT_READDATA, hd_src);
/* provide the size of the upload, we specicially typecast the value
to curl_off_t since we must be sure to use the correct data size */
/* provide the size of the upload, we typecast the value to curl_off_t
since we must be sure to use the correct data size */
curl_easy_setopt(curl, CURLOPT_INFILESIZE_LARGE,
(curl_off_t)file_info.st_size);

Просмотреть файл

@ -255,7 +255,7 @@ static int h2_client_new(struct Curl_cfilter *cf,
int rc = nghttp2_option_new(&o);
if(rc)
return rc;
/* We handle window updates ourself to enfore buffer limits */
/* We handle window updates ourself to enforce buffer limits */
nghttp2_option_set_no_auto_window_update(o, 1);
#if NGHTTP2_VERSION_NUM >= 0x013200
/* with 1.50.0 */

Просмотреть файл

@ -747,7 +747,7 @@ CURLcode Curl_socket_connect_result(struct Curl_easy *data,
}
/* We have a recv buffer to enhance reads with len < NW_SMALL_READS.
* This happens often on TLS connections where the TLS implemenation
* This happens often on TLS connections where the TLS implementation
* tries to read the head of a TLS record, determine the length of the
* full record and then make a subsequent read for that.
* On large reads, we will not fill the buffer to avoid the double copy. */

Просмотреть файл

@ -1721,7 +1721,7 @@ static CURLcode cookie_output(struct Curl_easy *data,
}
/*
* If we reach here we have successfully written a cookie file so theree is
* If we reach here we have successfully written a cookie file so there is
* no need to inspect the error, any error case should have jumped into the
* error block below.
*/

Просмотреть файл

@ -274,7 +274,7 @@ Curl_he2ai(const struct hostent *he, int port)
for(i = 0; (curr = he->h_addr_list[i]) != NULL; i++) {
size_t ss_size;
size_t namelen = strlen(he->h_name) + 1; /* include null-terminatior */
size_t namelen = strlen(he->h_name) + 1; /* include null-terminator */
#ifdef ENABLE_IPV6
if(he->h_addrtype == AF_INET6)
ss_size = sizeof(struct sockaddr_in6);

Просмотреть файл

@ -81,7 +81,7 @@
/* spare chunks we keep for a full window */
#define H2_STREAM_POOL_SPARES (H2_STREAM_WINDOW_SIZE / H2_CHUNK_SIZE)
/* We need to accomodate the max number of streams with their window
/* We need to accommodate the max number of streams with their window
* sizes on the overall connection. Streams might become PAUSED which
* will block their received QUOTA in the connection window. And if we
* run out of space, the server is blocked from sending us any data.
@ -327,7 +327,7 @@ static int h2_client_new(struct Curl_cfilter *cf,
int rc = nghttp2_option_new(&o);
if(rc)
return rc;
/* We handle window updates ourself to enfore buffer limits */
/* We handle window updates ourself to enforce buffer limits */
nghttp2_option_set_no_auto_window_update(o, 1);
#if NGHTTP2_VERSION_NUM >= 0x013200
/* with 1.50.0 */

Просмотреть файл

@ -651,7 +651,7 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname,
*/
#define HOST_ERROR -1 /* out of memory */
#define HOST_BAD -2 /* bad IPv4 adddress */
#define HOST_BAD -2 /* bad IPv4 address */
#define HOST_NAME 1
#define HOST_IPV4 2

Просмотреть файл

@ -219,7 +219,7 @@ bool Curl_auth_is_spnego_supported(void);
message */
CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
const char *user,
const char *passwood,
const char *password,
const char *service,
const char *host,
const char *chlg64,

Просмотреть файл

@ -1443,7 +1443,7 @@ static int cb_h3_acked_req_body(nghttp3_conn *conn, int64_t stream_id,
(void)cf;
if(!stream)
return 0;
/* The server ackknowledged `datalen` of bytes from our request body.
/* The server acknowledged `datalen` of bytes from our request body.
* This is a delta. We have kept this data in `sendbuf` for
* re-transmissions and can free it now. */
if(datalen >= (uint64_t)stream->sendbuf_len_in_flight)

Просмотреть файл

@ -2719,7 +2719,7 @@ check_handshake:
failf(data, "Peer rejected unexpected message");
break;
#if CURL_BUILD_MAC_10_11 || CURL_BUILD_IOS_9
/* Treaing non-fatal error as fatal like before */
/* Treating non-fatal error as fatal like before */
case errSSLClientHelloReceived:
failf(data, "A non-fatal result for providing a server name "
"indication");

Просмотреть файл

@ -172,7 +172,7 @@ static const struct Curl_OID OIDtable[] = {
* It is intended to support certificate information gathering for SSL backends
* that offer a mean to get certificates as a whole, but do not supply
* entry points to get particular certificate sub-fields.
* Please note there is no pretention here to rewrite a full SSL library.
* Please note there is no pretension here to rewrite a full SSL library.
*/
static const char *getASN1Element(struct Curl_asn1Element *elem,

Просмотреть файл

@ -475,9 +475,8 @@ AC_DEFUN([CURL_CONFIGURE_SYMBOL_HIDING], [
dnl CURL_CHECK_LIB_ARES
dnl -------------------------------------------------
dnl When c-ares library support has been requested,
dnl performs necessary checks and adjustsments needed
dnl to enable support of this library.
dnl When c-ares library support has been requested, performs necessary checks
dnl and adjustments needed to enable support of this library.
AC_DEFUN([CURL_CHECK_LIB_ARES], [
#

Просмотреть файл

@ -2281,7 +2281,7 @@
d CURLSTS_DONE c 1
d CURLSTS_FAIL c 2
*
* Renaming CURLMsg to CURL_Msg to avoid case-insensivity name clash.
* Renaming CURLMsg to CURL_Msg to avoid case-insensitivity name clash.
*
d CURL_Msg ds based(######ptr######)
d qualified

Просмотреть файл

@ -208,7 +208,7 @@ make_module()
# putting it in an include file makes it only active
# for that include file.
# Thus we build a temporary file with the pragma prepended to
# the source file and we compile that themporary file.
# the source file and we compile that temporary file.
echo "#line 1 \"${2}\"" > __tmpsrcf.c
echo "#pragma convert(819)" >> __tmpsrcf.c

Просмотреть файл

@ -2,7 +2,7 @@ From file: CURL_RELEASE_NOTE_START.TXT
Note: These kits are produced by a hobbyist and are providing any support
or any commitment to supply bug fixes or future releases. This code is
as-is with no warrantees.
as-is with no warranties.
The testing of this build of curl was minimal and involved building some of
the sample and test programs, accessing a public HTTPS: website, doing a

Просмотреть файл

@ -87,7 +87,7 @@ size_t tool_read_cb(char *buffer, size_t sz, size_t nmemb, void *userdata)
}
in->config->readbusy = FALSE;
/* when select() rerturned zero here, it timed out */
/* when select() returned zero here, it timed out */
return (size_t)rc;
}

Просмотреть файл

@ -118,7 +118,7 @@ struct OperationConfig {
bool dirlistonly; /* only get the FTP dir list */
bool followlocation; /* follow http redirects */
bool unrestricted_auth; /* Continue to send authentication (user+password)
when following ocations, even when hostname
when following redirects, even when hostname
changed */
bool netrc_opt;
bool netrc;

Просмотреть файл

@ -53,7 +53,7 @@ Accept: */*
</protocol>
# Hyper curl returns unsupported protocol
# bullt-in curl returns weird_server_reply
# built-in curl returns weird_server_reply
<errorcode>
%if hyper
1

Просмотреть файл

@ -30,7 +30,7 @@ CURLOPT_CURLU and CURLOPT_PORT
lib%TESTNUMBER
</tool>
# The tool does two requesets, the first sets CURLOPT_PORT to 1
# The tool does two requests, the first sets CURLOPT_PORT to 1
# the second resets the port again and expects that request to work.
<command>
http://%HOSTIP:%HTTPPORT/%TESTNUMBER

Просмотреть файл

@ -11,7 +11,7 @@ cookiejar
#
# The cookies set come in two versions. This is because when curl is built
# with Hyper, the API provides the headers already "sanitized" so we cannot
# compapare with the exact server contents unlesss it too sends the data
# compare with the exact server contents unless it too sends the data
# "clean".
<reply>

Просмотреть файл

@ -53,7 +53,7 @@ Accept: */*
</protocol>
# Hyper curl returns unsupported protocol
# bullt-in curl returns weird_server_reply
# built-in curl returns weird_server_reply
<errorcode>
%if hyper
1

Просмотреть файл

@ -34,7 +34,7 @@ Set-Cookie: mycookie1=; Path=/; Max-Age=-1; Expires=Thu, 01 Jan 1970 00:00:00 GM
http
</server>
<name>
Setting cookies set with expried dates that were loaded from jar
Setting cookies set with expired dates that were loaded from jar
</name>
<command>
http://%HOSTIP:%HTTPPORT/func_test/del_cookie -b %LOGDIR/cookie%TESTNUMBER -c %LOGDIR/save%TESTNUMBER

Просмотреть файл

@ -24,7 +24,7 @@
###########################################################################
# This script is intended for developers to test some internals of the
# runtests.pl harneess. Don't try to use this unless you know what you're
# runtests.pl harness. Don't try to use this unless you know what you're
# doing!
# An example command-line that starts a test http server for test 11 and waits

Просмотреть файл

@ -22,7 +22,7 @@
#
###########################################################################
# This module contains miscellanous functions needed in several parts of
# This module contains miscellaneous functions needed in several parts of
# the test suite.
package testutil;

Просмотреть файл

@ -76,7 +76,7 @@ static void expect_timer_seconds(struct Curl_easy *data, int seconds)
}
/* Scenario: simulate a redirect. When a redirect occurs, t_nslookup,
* t_connect, t_appconnect, t_pretransfer, and t_starttransfer are addative.
* t_connect, t_appconnect, t_pretransfer, and t_starttransfer are additive.
* E.g., if t_starttransfer took 2 seconds initially and took another 1
* second for the redirect request, then the resulting t_starttransfer should
* be 3 seconds. */

Просмотреть файл

@ -364,36 +364,36 @@ static struct test_case TEST_CASES[] = {
/* TIMEOUT_MS, FAIL_MS CREATED DURATION Result, HE_PREF */
/* CNCT HE v4 v6 v4 v6 MIN MAX */
{ 1, TURL, "test.com:123:192.0.2.1", CURL_IPRESOLVE_WHATEVER,
250, 150, 200, 200, 1, 0, 200, 500, R_FAIL, NULL },
250, 150, 200, 200, 1, 0, 200, 500, R_FAIL, NULL },
/* 1 ipv4, fails after ~200ms, reports COULDNT_CONNECT */
{ 2, TURL, "test.com:123:192.0.2.1,192.0.2.2", CURL_IPRESOLVE_WHATEVER,
500, 150, 200, 200, 2, 0, 400, 800, R_FAIL, NULL },
500, 150, 200, 200, 2, 0, 400, 800, R_FAIL, NULL },
/* 2 ipv4, fails after ~400ms, reports COULDNT_CONNECT */
#ifdef ENABLE_IPV6
{ 3, TURL, "test.com:123:::1", CURL_IPRESOLVE_WHATEVER,
250, 150, 200, 200, 0, 1, 200, 500, R_FAIL, NULL },
250, 150, 200, 200, 0, 1, 200, 500, R_FAIL, NULL },
/* 1 ipv6, fails after ~200ms, reports COULDNT_CONNECT */
{ 4, TURL, "test.com:123:::1,::2", CURL_IPRESOLVE_WHATEVER,
500, 150, 200, 200, 0, 2, 400, 800, R_FAIL, NULL },
500, 150, 200, 200, 0, 2, 400, 800, R_FAIL, NULL },
/* 2 ipv6, fails after ~400ms, reports COULDNT_CONNECT */
{ 5, TURL, "test.com:123:192.0.2.1,::1", CURL_IPRESOLVE_WHATEVER,
500, 150, 200, 200, 1, 1, 350, 800, R_FAIL, "v4" },
500, 150, 200, 200, 1, 1, 350, 800, R_FAIL, "v4" },
/* mixed ip4+6, v4 starts, v6 kicks in on HE, fails after ~350ms */
{ 6, TURL, "test.com:123:::1,192.0.2.1", CURL_IPRESOLVE_WHATEVER,
500, 150, 200, 200, 1, 1, 350, 800, R_FAIL, "v6" },
500, 150, 200, 200, 1, 1, 350, 800, R_FAIL, "v6" },
/* mixed ip6+4, v6 starts, v4 kicks in on HE, fails after ~350ms */
{ 7, TURL, "test.com:123:::1,192.0.2.1,::2,::3", CURL_IPRESOLVE_WHATEVER,
500, 600, 200, 200, 0, 3, 350, 800, R_FAIL, "v6" },
500, 600, 200, 200, 0, 3, 350, 800, R_FAIL, "v6" },
/* mixed ip6+4, v6 starts, v4 never starts due to high HE, TIMEOUT */
{ 8, TURL, "test.com:123:192.0.2.1,::1", CURL_IPRESOLVE_V4,
400, 150, 500, 500, 1, 0, 400, 600, R_FAIL, NULL },
400, 150, 500, 500, 1, 0, 400, 600, R_FAIL, NULL },
/* mixed ip4+6, but only use v4, check it uses full connect timeout,
although another address of the 'wrong' family is availbale */
although another address of the 'wrong' family is available */
{ 9, TURL, "test.com:123:::1,192.0.2.1", CURL_IPRESOLVE_V6,
400, 150, 500, 500, 0, 1, 400, 600, R_FAIL, NULL },
400, 150, 500, 500, 0, 1, 400, 600, R_FAIL, NULL },
/* mixed ip4+6, but only use v6, check it uses full connect timeout,
although another address of the 'wrong' family is availbale */
although another address of the 'wrong' family is available */
#endif
};