From: Daniel Stenberg Date: Fri, 30 May 2025 08:27:35 +0000 (+0200) Subject: spelling: 'a' vs 'an' X-Git-Tag: curl-8_14_1~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdb7d8b004578d4e3906896eb290a80f6e9ebb75;p=thirdparty%2Fcurl.git spelling: 'a' vs 'an' Closes #17487 --- diff --git a/docs/FAQ b/docs/FAQ index 9fae793e01..5c92b4688d 100644 --- a/docs/FAQ +++ b/docs/FAQ @@ -1411,7 +1411,7 @@ FAQ 6. License Issues - curl and libcurl are released under a MIT/X derivative license. The license + curl and libcurl are released under an MIT/X derivative license. The license is liberal and should not impose a problem for your project. This section is just a brief summary for the cases we get the most questions. (Parts of this section was much enhanced by Bjorn Reese.) diff --git a/docs/INSTALL.md b/docs/INSTALL.md index f61c0ead31..a70a78aa8e 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -459,7 +459,7 @@ to adjust those variables accordingly. After that you can build curl like this: ./configure --host aarch64-linux-android --with-pic --disable-shared Note that this does not give you SSL/TLS support. If you need SSL/TLS, you -have to build curl with a SSL/TLS library, e.g. OpenSSL, because it is +have to build curl with an SSL/TLS library, e.g. OpenSSL, because it is impossible for curl to access Android's native SSL/TLS layer. To build curl for Android using OpenSSL, follow the OpenSSL build instructions and then install `libssl.a` and `libcrypto.a` to `$TOOLCHAIN/sysroot/usr/lib` and copy diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS index 6b2a7b81b1..8abec28187 100644 --- a/docs/KNOWN_BUGS +++ b/docs/KNOWN_BUGS @@ -400,9 +400,9 @@ problems may have been fixed or changed somewhat since this was written. 9.1 SFTP does not do CURLOPT_POSTQUOTE correct - When libcurl sends CURLOPT_POSTQUOTE commands when connected to a SFTP server - using the multi interface, the commands are not being sent correctly and - instead the connection is "cancelled" (the operation is considered done) + When libcurl sends CURLOPT_POSTQUOTE commands when connected to an SFTP + server using the multi interface, the commands are not being sent correctly + and instead the connection is "cancelled" (the operation is considered done) prematurely. There is a half-baked (busy-looping) patch provided in the bug report but it cannot be accepted as-is. See https://curl.se/bug/view.cgi?id=748 diff --git a/docs/SSL-PROBLEMS.md b/docs/SSL-PROBLEMS.md index 620392c4ea..301ce7e870 100644 --- a/docs/SSL-PROBLEMS.md +++ b/docs/SSL-PROBLEMS.md @@ -40,8 +40,8 @@ SPDX-License-Identifier: curl Some broken servers fail to support the protocol negotiation properly that SSL servers are supposed to handle. This may cause the connection to fail - completely. Sometimes you may need to explicitly select a SSL version to use - when connecting to make the connection succeed. + completely. Sometimes you may need to explicitly select an SSL version to + use when connecting to make the connection succeed. An additional complication can be that modern SSL libraries sometimes are built with support for older SSL and TLS versions disabled. diff --git a/docs/TODO b/docs/TODO index 9e398d8283..6413718ff7 100644 --- a/docs/TODO +++ b/docs/TODO @@ -238,7 +238,7 @@ See https://github.com/curl/curl/issues/4915 and lib1541.c The share interface offers CURL_LOCK_DATA_HSTS to have multiple easy handle - share a HSTS cache, but this is not thread-safe. + share an HSTS cache, but this is not thread-safe. 1.5 get rid of PATH_MAX @@ -752,7 +752,7 @@ 11.1 File listing support - Add support for listing the contents of a SMB share. The output should + Add support for listing the contents of an SMB share. The output should probably be the same as/similar to FTP. 11.2 Honor file timestamps diff --git a/docs/URL-SYNTAX.md b/docs/URL-SYNTAX.md index 81c69260da..44412b4eb9 100644 --- a/docs/URL-SYNTAX.md +++ b/docs/URL-SYNTAX.md @@ -318,9 +318,9 @@ was specified in the URL. That was a bug fixed in 7.62.0, which added ## LDAP -The path part of a LDAP request can be used to specify the: Distinguished -Name, Attributes, Scope, Filter and Extension for a LDAP search. Each field is -separated by a question mark and when that field is not required an empty +The path part of an LDAP request can be used to specify the: Distinguished +Name, Attributes, Scope, Filter and Extension for an LDAP search. Each field +is separated by a question mark and when that field is not required an empty string with the question mark separator should be included. Search for the `DN` as `My Organization`: @@ -336,8 +336,8 @@ Search for an empty `DN` and request information about the ldap://ldap.example.com/?rootDomainNamingContext -For more information about the individual components of a LDAP URL please -see [RFC 4516](https://datatracker.ietf.org/doc/html/rfc4516). +For more information about the individual components of an LDAP URL please see +[RFC 4516](https://datatracker.ietf.org/doc/html/rfc4516). ## POP3 @@ -361,7 +361,7 @@ file. If the path is omitted entirely then the directory listing for the root / home directory is returned. ## SMB -The path part of a SMB request specifies the file to retrieve and from what +The path part of an SMB request specifies the file to retrieve and from what share and directory or the share to upload to and as such, may not be omitted. If the username is embedded in the URL then it must contain the domain name and as such, the backslash must be URL encoded as %2f. @@ -373,7 +373,7 @@ curl supports SMB version 1 (only) ## SMTP -The path part of a SMTP request specifies the hostname to present during +The path part of an SMTP request specifies the hostname to present during communication with the mail server. If the path is omitted, then libcurl attempts to resolve the local computer's hostname. However, this may not return the fully qualified domain name that is required by some mail servers diff --git a/docs/examples/imap-ssl.c b/docs/examples/imap-ssl.c index a2774bea4a..e632c30e86 100644 --- a/docs/examples/imap-ssl.c +++ b/docs/examples/imap-ssl.c @@ -49,7 +49,7 @@ int main(void) curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret"); /* This fetches message 1 from the user's inbox. Note the use of - * imaps:// rather than imap:// to request a SSL based connection. */ + * imaps:// rather than imap:// to request an SSL based connection. */ curl_easy_setopt(curl, CURLOPT_URL, "imaps://imap.example.com/INBOX/;UID=1"); diff --git a/docs/examples/multithread.c b/docs/examples/multithread.c index 3b500c7652..7978419bdc 100644 --- a/docs/examples/multithread.c +++ b/docs/examples/multithread.c @@ -35,7 +35,7 @@ /* List of URLs to fetch. - If you intend to use a SSL-based protocol here you might need to setup TLS + If you intend to use an SSL-based protocol here you might need to setup TLS library mutex callbacks as described here: https://curl.se/libcurl/c/threadsafe.html diff --git a/docs/examples/pop3-ssl.c b/docs/examples/pop3-ssl.c index dcc7992e41..23dd959ea0 100644 --- a/docs/examples/pop3-ssl.c +++ b/docs/examples/pop3-ssl.c @@ -48,8 +48,8 @@ int main(void) curl_easy_setopt(curl, CURLOPT_USERNAME, "user"); curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret"); - /* This retrieves message 1 from the user's mailbox. Note the use of - * pop3s:// rather than pop3:// to request a SSL based connection. */ + /* This retrieves message 1 from the user's mailbox. Note the use of * + pop3s:// rather than pop3:// to request an SSL based connection. */ curl_easy_setopt(curl, CURLOPT_URL, "pop3s://pop.example.com/1"); /* If you want to connect to a site who is not using a certificate that is diff --git a/docs/examples/smtp-ssl.c b/docs/examples/smtp-ssl.c index 150de9ceab..c88b4fe7ca 100644 --- a/docs/examples/smtp-ssl.c +++ b/docs/examples/smtp-ssl.c @@ -100,7 +100,7 @@ int main(void) curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret"); /* This is the URL for your mailserver. Note the use of smtps:// rather - * than smtp:// to request a SSL based connection. */ + * than smtp:// to request an SSL based connection. */ curl_easy_setopt(curl, CURLOPT_URL, "smtps://mainserver.example.net"); /* If you want to connect to a site who is not using a certificate that is diff --git a/docs/internals/CLIENT-READERS.md b/docs/internals/CLIENT-READERS.md index 073063845a..35caaa6bfc 100644 --- a/docs/internals/CLIENT-READERS.md +++ b/docs/internals/CLIENT-READERS.md @@ -128,5 +128,8 @@ By adding the client reader interface, any protocol can control how/if it wants The protocols on the other hand no longer have to care to package data most efficiently. At any time, should more data be needed, it can be read from the client. This is used when sending HTTP requests headers to add as much request body data to the initial sending as there is room for. Future enhancements based on the client readers: -* `expect-100` handling: place that into a HTTP specific reader at `CURL_CR_PROTOCOL` and eliminate the checks in the generic transfer parts. -* `eos forwarding`: transfer should forward an `eos` flag to the connection filters. Filters like HTTP/2 and HTTP/3 can make use of that, terminating streams early. This would also eliminate length checks in stream handling. +* `expect-100` handling: place that into an HTTP specific reader at + `CURL_CR_PROTOCOL` and eliminate the checks in the generic transfer parts. +* `eos forwarding`: transfer should forward an `eos` flag to the connection + filters. Filters like HTTP/2 and HTTP/3 can make use of that, terminating + streams early. This would also eliminate length checks in stream handling. diff --git a/docs/internals/CONNECTION-FILTERS.md b/docs/internals/CONNECTION-FILTERS.md index 629e769b90..09acc7ad95 100644 --- a/docs/internals/CONNECTION-FILTERS.md +++ b/docs/internals/CONNECTION-FILTERS.md @@ -21,7 +21,7 @@ The most important feat of connection filters is that they can be stacked on top of each other (or "chained" if you prefer that metaphor). In the common scenario that you want to retrieve a `https:` URL with curl, you need 2 basic things to send the request and get the response: a TCP connection, represented -by a `socket` and a SSL instance en- and decrypt over that socket. You write +by a `socket` and an SSL instance en- and decrypt over that socket. You write your request to the SSL instance, which encrypts and writes that data to the socket, which then sends the bytes over the network. diff --git a/docs/libcurl/libcurl-env-dbg.md b/docs/libcurl/libcurl-env-dbg.md index aeb79ff395..a5e977f302 100644 --- a/docs/libcurl/libcurl-env-dbg.md +++ b/docs/libcurl/libcurl-env-dbg.md @@ -29,8 +29,8 @@ Bypass the AltSvc HTTPS protocol restriction if this variable exists. ## `CURL_DBG_SOCK_RBLOCK` -The percentage of recv() calls that should be answered with a EAGAIN at random. -For TCP/UNIX sockets. +The percentage of recv() calls that should be answered with an EAGAIN at +random. For TCP/UNIX sockets. ## `CURL_DBG_SOCK_RMAX` @@ -42,8 +42,8 @@ maximum of 400 bytes. ## `CURL_DBG_SOCK_WBLOCK` -The percentage of send() calls that should be answered with a EAGAIN at random. -For TCP/UNIX sockets. +The percentage of send() calls that should be answered with an EAGAIN at +random. For TCP/UNIX sockets. ## `CURL_DBG_SOCK_WPARTIAL` diff --git a/docs/libcurl/libcurl-env.md b/docs/libcurl/libcurl-env.md index 5b73320465..ac907f1bbd 100644 --- a/docs/libcurl/libcurl-env.md +++ b/docs/libcurl/libcurl-env.md @@ -83,7 +83,7 @@ Username to use when invoking the *ntlm-wb* tool. ## `SSLKEYLOGFILE` -When set and libcurl runs with a SSL backend that supports this feature, +When set and libcurl runs with an SSL backend that supports this feature, libcurl saves SSL secrets into the given filename. Using those SSL secrets, other tools (such as Wireshark) can decrypt the SSL communication and analyze/view the traffic. diff --git a/docs/libcurl/libcurl-errors.md b/docs/libcurl/libcurl-errors.md index 110702339d..ed2f4ca5a7 100644 --- a/docs/libcurl/libcurl-errors.md +++ b/docs/libcurl/libcurl-errors.md @@ -105,7 +105,7 @@ CURLOPT_ACCEPTTIMEOUT_MS(3) (or the internal default) timeout expired. ## CURLE_FTP_WEIRD_PASV_REPLY (13) libcurl failed to get a sensible result back from the server as a response to -either a PASV or a EPSV command. The server is flawed. +either a PASV or an EPSV command. The server is flawed. ## CURLE_FTP_WEIRD_227_FORMAT (14) diff --git a/lib/cf-https-connect.c b/lib/cf-https-connect.c index c677f12f7b..cd0d226efd 100644 --- a/lib/cf-https-connect.c +++ b/lib/cf-https-connect.c @@ -658,7 +658,7 @@ CURLcode Curl_cf_https_setup(struct Curl_easy *data, if(conn->bits.tls_enable_alpn) { #ifdef USE_HTTPSRR - /* Is there a HTTPSRR use its ALPNs here. + /* Is there an HTTPSRR use its ALPNs here. * We are here after having selected a connection to a host+port and * can no longer change that. Any HTTPSRR advice for other hosts and ports * we need to ignore. */ diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c index 6516db56b9..cd577e8a5e 100644 --- a/lib/curl_sspi.c +++ b/lib/curl_sspi.c @@ -129,7 +129,7 @@ void Curl_sspi_global_cleanup(void) /* * Curl_create_sspi_identity() * - * This is used to populate a SSPI identity structure based on the supplied + * This is used to populate an SSPI identity structure based on the supplied * username and password. * * Parameters: @@ -221,7 +221,7 @@ CURLcode Curl_create_sspi_identity(const char *userp, const char *passwdp, /* * Curl_sspi_free_identity() * - * This is used to free the contents of a SSPI identifier structure. + * This is used to free the contents of an SSPI identifier structure. * * Parameters: * diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h index cafdb8d3bc..8fdf8ef249 100644 --- a/lib/curl_sspi.h +++ b/lib/curl_sspi.h @@ -45,7 +45,7 @@ CURLcode Curl_sspi_global_init(void); void Curl_sspi_global_cleanup(void); -/* This is used to populate the domain in a SSPI identity structure */ +/* This is used to populate the domain in an SSPI identity structure */ CURLcode Curl_override_sspi_http_realm(const char *chlg, SEC_WINNT_AUTH_IDENTITY *identity); diff --git a/lib/ftp.c b/lib/ftp.c index 09a31d814a..0aa19262f7 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -2716,8 +2716,8 @@ static CURLcode ftp_pp_statemachine(struct Curl_easy *data, #endif if(data->set.use_ssl && !conn->bits.ftp_use_control_ssl) { - /* We do not have a SSL/TLS control connection yet, but FTPS is - requested. Try a FTPS connection now */ + /* We do not have an SSL/TLS control connection yet, but FTPS is + requested. Try an FTPS connection now */ ftpc->count3 = 0; switch(data->set.ftpsslauth) { diff --git a/lib/http.c b/lib/http.c index 9f519381f0..5942d313b8 100644 --- a/lib/http.c +++ b/lib/http.c @@ -3638,7 +3638,7 @@ static CURLcode http_on_response(struct Curl_easy *data, /* We expect more response from HTTP/2 later */ k->header = TRUE; k->headerline = 0; /* restart the header line counter */ - k->httpversion_sent = 20; /* It's a HTTP/2 request now */ + k->httpversion_sent = 20; /* It's an HTTP/2 request now */ /* Any remaining `buf` bytes are already HTTP/2 and passed to * be processed. */ result = Curl_http2_upgrade(data, conn, FIRSTSOCKET, buf, blen); diff --git a/lib/http_chunks.h b/lib/http_chunks.h index 0461c80f78..b84e479fcd 100644 --- a/lib/http_chunks.h +++ b/lib/http_chunks.h @@ -49,7 +49,7 @@ typedef enum { POST_CR state. */ CHUNK_DATA, - /* POSTLF should get a CR and then a LF and nothing else, then move back to + /* POSTLF should get a CR and then an LF and nothing else, then move back to HEX as the CRLF combination marks the end of a chunk. A missing CR is no big deal. */ CHUNK_POSTLF, @@ -64,7 +64,7 @@ typedef enum { CHUNK_TRAILER, /* A trailer CR has been found - next state is CHUNK_TRAILER_POSTCR. - Next char must be a LF */ + Next char must be an LF */ CHUNK_TRAILER_CR, /* A trailer LF must be found now, otherwise CHUNKE_BAD_CHUNK will be diff --git a/lib/imap.c b/lib/imap.c index 4b2e6087f2..fc38a5b61e 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -1032,7 +1032,7 @@ static CURLcode imap_state_capability_resp(struct Curl_easy *data, (void)instate; /* no use for this yet */ - /* Do we have a untagged response? */ + /* Do we have an untagged response? */ if(imapcode == '*') { line += 2; diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c index a1a34891c0..bb2ec57872 100644 --- a/lib/inet_ntop.c +++ b/lib/inet_ntop.c @@ -56,7 +56,7 @@ * Returns `dst' (as a const) * Note: * - uses no statics - * - takes a unsigned char* not an in_addr as input + * - takes an unsigned char* not an in_addr as input */ static char *inet_ntop4(const unsigned char *src, char *dst, size_t size) { diff --git a/lib/pop3.c b/lib/pop3.c index 852834ecec..aa8c2d834a 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -874,7 +874,7 @@ static CURLcode pop3_state_capa_resp(struct Curl_easy *data, int pop3code, line = curlx_dyn_ptr(&pop3c->pp.recvbuf); len = pop3c->pp.nfinal; - /* Do we have a untagged continuation response? */ + /* Do we have an untagged continuation response? */ if(pop3code == '*') { /* Does the server support the STLS capability? */ if(len >= 4 && !memcmp(line, "STLS", 4)) diff --git a/lib/setopt.c b/lib/setopt.c index dae870a5c9..d5ddf6d0c2 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -2022,7 +2022,7 @@ static CURLcode setopt_cptr(struct Curl_easy *data, CURLoption option, break; case CURLOPT_SSL_CTX_DATA: /* - * Set a SSL_CTX callback parameter pointer + * Set an SSL_CTX callback parameter pointer */ #ifdef USE_SSL if(Curl_ssl_supports(data, SSLSUPP_SSL_CTX)) { @@ -2787,7 +2787,7 @@ static CURLcode setopt_func(struct Curl_easy *data, CURLoption option, break; case CURLOPT_SSL_CTX_FUNCTION: /* - * Set a SSL_CTX callback + * Set an SSL_CTX callback */ #ifdef USE_SSL if(Curl_ssl_supports(data, SSLSUPP_SSL_CTX)) { diff --git a/lib/smtp.c b/lib/smtp.c index fbab5401f8..d39bb58d5d 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -601,7 +601,7 @@ static CURLcode smtp_perform_authentication(struct Curl_easy *data, * * smtp_perform_command() * - * Sends a SMTP based command. + * Sends an SMTP based command. */ static CURLcode smtp_perform_command(struct Curl_easy *data, struct smtp_conn *smtpc, @@ -1036,7 +1036,7 @@ static CURLcode smtp_state_ehlo_resp(struct Curl_easy *data, if(smtpcode != 1) { if(data->set.use_ssl && !Curl_conn_is_ssl(data->conn, FIRSTSOCKET)) { - /* We do not have a SSL/TLS connection yet, but SSL is requested */ + /* We do not have an SSL/TLS connection yet, but SSL is requested */ if(smtpc->tls_supported) /* Switch to TLS connection now */ result = smtp_perform_starttls(data, smtpc); diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index d0182f6fe1..2761c59965 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -242,7 +242,7 @@ CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data, /* * Curl_override_sspi_http_realm() * - * This is used to populate the domain in a SSPI identity structure + * This is used to populate the domain in an SSPI identity structure * The realm is extracted from the challenge message and used as the * domain if it is not already explicitly set. * diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c index 06de842084..e2872b2522 100644 --- a/lib/vauth/vauth.c +++ b/lib/vauth/vauth.c @@ -39,7 +39,7 @@ /* * Curl_auth_build_spn() * - * This is used to build a SPN string in the following formats: + * This is used to build an SPN string in the following formats: * * service/host@realm (Not currently used) * service/host (Not used by GSS-API) diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h index d845988067..58b13f582c 100644 --- a/lib/vauth/vauth.h +++ b/lib/vauth/vauth.h @@ -60,7 +60,7 @@ struct gsasldata; */ bool Curl_auth_allowed_to_host(struct Curl_easy *data); -/* This is used to build a SPN string */ +/* This is used to build an SPN string */ #if !defined(USE_WINDOWS_SSPI) char *Curl_auth_build_spn(const char *service, const char *host, const char *realm); diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c index bb2a0265cd..74c36fed94 100644 --- a/lib/vtls/gtls.c +++ b/lib/vtls/gtls.c @@ -233,7 +233,7 @@ static void unload_file(gnutls_datum_t data) } -/* this function does a SSL/TLS (re-)handshake */ +/* this function does an SSL/TLS (re-)handshake */ static CURLcode handshake(struct Curl_cfilter *cf, struct Curl_easy *data) { diff --git a/lib/vtls/keylog.c b/lib/vtls/keylog.c index 8f4880cf8e..8487d43e8c 100644 --- a/lib/vtls/keylog.c +++ b/lib/vtls/keylog.c @@ -94,7 +94,7 @@ Curl_tls_keylog_write_line(const char *line) linelen = strlen(line); if(linelen == 0 || linelen > sizeof(buf) - 2) { - /* Empty line or too big to fit in a LF and NUL. */ + /* Empty line or too big to fit in an LF and NUL. */ return FALSE; } diff --git a/lib/vtls/keylog.h b/lib/vtls/keylog.h index a00a225616..ec82abf547 100644 --- a/lib/vtls/keylog.h +++ b/lib/vtls/keylog.h @@ -61,7 +61,7 @@ bool Curl_tls_keylog_write(const char *label, const unsigned char *secret, size_t secretlen); /* - * Appends a line to the key log file, ensure it is terminated by a LF. + * Appends a line to the key log file, ensure it is terminated by an LF. * Returns true iff the key log file is open and a valid line was provided. */ bool Curl_tls_keylog_write_line(const char *line); diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index ffdae23995..6907840886 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -4048,7 +4048,7 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx, CVE-2010-4180 when using previous OpenSSL versions we no longer enable this option regardless of OpenSSL version and SSL_OP_ALL definition. - OpenSSL added a work-around for a SSL 3.0/TLS 1.0 CBC vulnerability: + OpenSSL added a work-around for an SSL 3.0/TLS 1.0 CBC vulnerability: https://web.archive.org/web/20240114184648/openssl.org/~bodo/tls-cbc.txt. In 0.9.6e they added a bit to SSL_OP_ALL that _disables_ that work-around despite the fact that SSL_OP_ALL is documented to do "rather harmless" diff --git a/lib/vtls/vtls_scache.h b/lib/vtls/vtls_scache.h index c95fa42af1..eef50805e4 100644 --- a/lib/vtls/vtls_scache.h +++ b/lib/vtls/vtls_scache.h @@ -113,7 +113,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf, void *sobj, Curl_ssl_scache_obj_dtor *sobj_dtor_cb); -/* All about a SSL session ticket */ +/* All about an SSL session ticket */ struct Curl_ssl_session { const void *sdata; /* session ticket data, plain bytes */ size_t sdata_len; /* number of bytes in sdata */ diff --git a/tests/data/test1267 b/tests/data/test1267 index d94a330b2c..42cf40c31d 100644 --- a/tests/data/test1267 +++ b/tests/data/test1267 @@ -23,7 +23,7 @@ swsclose http -HTTP GET with a invalid HTTP/1 response line start +HTTP GET with an invalid HTTP/1 response line start http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9 diff --git a/tests/data/test1704 b/tests/data/test1704 index a8740187f4..0401f796b4 100644 --- a/tests/data/test1704 +++ b/tests/data/test1704 @@ -33,7 +33,7 @@ h2c http -HTTP/1 doing HTTP/2 Upgrade: getting a HTTP/2 101 response +HTTP/1 doing HTTP/2 Upgrade: getting an HTTP/2 101 response http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2 diff --git a/tests/data/test208 b/tests/data/test208 index d2b3e15990..8d90e3e2b0 100644 --- a/tests/data/test208 +++ b/tests/data/test208 @@ -30,7 +30,7 @@ ftp proxy -HTTP PUT to a FTP URL with username+password - over HTTP proxy +HTTP PUT to an FTP URL with username+password - over HTTP proxy -x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/http/scorecard.py b/tests/http/scorecard.py index ba9f6d9eb4..93d6c05eb2 100644 --- a/tests/http/scorecard.py +++ b/tests/http/scorecard.py @@ -667,7 +667,7 @@ def parse_size(s): def main(): parser = argparse.ArgumentParser(prog='scorecard', description=""" - Run a range of tests to give a scorecard for a HTTP protocol + Run a range of tests to give a scorecard for an HTTP protocol 'h3' or 'h2' implementation in curl. """) parser.add_argument("-v", "--verbose", action='count', default=1, diff --git a/tests/http/test_12_reuse.py b/tests/http/test_12_reuse.py index b08535ce5a..1d4a4a0ae2 100644 --- a/tests/http/test_12_reuse.py +++ b/tests/http/test_12_reuse.py @@ -77,7 +77,7 @@ class TestReuse: @pytest.mark.skipif(condition=not Env.have_h3(), reason="h3 not supported") def test_12_03_as_follow_h2h3(self, env: Env, httpd, configures_httpd, nghttpx): - # write a alt-svc file that advises h3 instead of h2 + # write an alt-svc file that advises h3 instead of h2 asfile = os.path.join(env.gen_dir, 'alt-svc-12_03.txt') self.create_asfile(asfile, f'h2 {env.domain1} {env.https_port} h3 {env.domain1} {env.h3_port}') curl = CurlClient(env=env) @@ -91,7 +91,7 @@ class TestReuse: @pytest.mark.skipif(condition=not Env.have_h3(), reason="h3 not supported") def test_12_04_as_follow_h3h2(self, env: Env, httpd, configures_httpd, nghttpx): count = 2 - # write a alt-svc file the advises h2 instead of h3 + # write an alt-svc file the advises h2 instead of h3 asfile = os.path.join(env.gen_dir, 'alt-svc-12_04.txt') ts = datetime.now() + timedelta(hours=24) expires = f'{ts.year:04}{ts.month:02}{ts.day:02} {ts.hour:02}:{ts.minute:02}:{ts.second:02}' @@ -113,7 +113,7 @@ class TestReuse: def test_12_05_as_follow_h3h1(self, env: Env, httpd, configures_httpd, nghttpx): # With '--http3` an Alt-Svc redirection from h3 to h1 is allowed count = 2 - # write a alt-svc file the advises h1 instead of h3 + # write an alt-svc file the advises h1 instead of h3 asfile = os.path.join(env.gen_dir, 'alt-svc-12_05.txt') ts = datetime.now() + timedelta(hours=24) expires = f'{ts.year:04}{ts.month:02}{ts.day:02} {ts.hour:02}:{ts.minute:02}:{ts.second:02}' @@ -135,7 +135,7 @@ class TestReuse: def test_12_06_as_ignore_h3h1(self, env: Env, httpd, configures_httpd, nghttpx): # With '--http3-only` an Alt-Svc redirection from h3 to h1 is ignored count = 2 - # write a alt-svc file the advises h1 instead of h3 + # write an alt-svc file the advises h1 instead of h3 asfile = os.path.join(env.gen_dir, 'alt-svc-12_05.txt') ts = datetime.now() + timedelta(hours=24) expires = f'{ts.year:04}{ts.month:02}{ts.day:02} {ts.hour:02}:{ts.minute:02}:{ts.second:02}' @@ -156,7 +156,7 @@ class TestReuse: @pytest.mark.skipif(condition=not Env.have_h3(), reason="h3 not supported") def test_12_07_as_ignore_h2h3(self, env: Env, httpd, configures_httpd, nghttpx): # With '--http2` an Alt-Svc redirection from h2 to h3 is ignored - # write a alt-svc file that advises h3 instead of h2 + # write an alt-svc file that advises h3 instead of h2 asfile = os.path.join(env.gen_dir, 'alt-svc-12_03.txt') self.create_asfile(asfile, f'h2 {env.domain1} {env.https_port} h3 {env.domain1} {env.h3_port}') curl = CurlClient(env=env) diff --git a/tests/libtest/lib2405.c b/tests/libtest/lib2405.c index fe40a3ba09..3d6919e298 100644 --- a/tests/libtest/lib2405.c +++ b/tests/libtest/lib2405.c @@ -29,7 +29,7 @@ * HTTP1 amd HTTP2 (no multiplexing) two transfers (expected two descriptors), * HTTP2 with multiplexing (expected one descriptors) * Improper inputs to the API result in CURLM_BAD_FUNCTION_ARGUMENT. - * Sending a empty ufds, and size = 0 will return the number of fds needed. + * Sending an empty ufds, and size = 0 will return the number of fds needed. * Sending a non-empty ufds, but smaller than the fds needed will result in a * CURLM_OUT_OF_MEMORY, and a number of fds that is >= to the number needed. * diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index f23a2454c2..3bc2fa5ed9 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -410,7 +410,7 @@ static int test_rlimit(int keep_open) } } -#endif /* using a FD_SETSIZE bound select() */ +#endif /* using an FD_SETSIZE bound select() */ /* * Old or 'backwards compatible' implementations of stdio do not allow diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index 96deb91f77..1e4d3839ae 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -424,7 +424,7 @@ static int test_rlimit(int keep_open) } } -#endif /* using a FD_SETSIZE bound select() */ +#endif /* using an FD_SETSIZE bound select() */ /* * Old or 'backwards compatible' implementations of stdio do not allow diff --git a/tests/unit/unit1660.c b/tests/unit/unit1660.c index 04aba1e7f5..2ab9aa3332 100644 --- a/tests/unit/unit1660.c +++ b/tests/unit/unit1660.c @@ -82,7 +82,7 @@ static const struct testit headers[] = { { "2.example.com", NULL, "max-age=\"21536000\"; includeSubDomains; includeSubDomains;", CURLE_BAD_FUNCTION_ARGUMENT }, - /* use a unknown directive "include" that should be ignored */ + /* use an unknown directive "include" that should be ignored */ { "3.example.com", NULL, "max-age=\"21536000\"; include; includeSubDomains;", CURLE_OK }, /* remove the "3.example.com" one, should still match the example.com */