mirror of
https://github.com/curl/curl.git
synced 2026-08-25 02:23:31 +03:00
tidy-up: miscellaneous
- fix typos and wording in documentation and comments. - KNOWN_BUGS: merge duplicate H1 section. - test_10_proxy: delete stray expressions. - Perl: `while()` -> `while(1)`. - Perl: fix indent, whitespace, drop redundant quotes and parentheses. - fix casing: URL, SSL, Windows. - badwords: readd `threadsafe`, add `well-known` (and fix it). - replace `WinXP` -> `Windows XP` to match other uses. Closes #21646
This commit is contained in:
parent
1c3289c85e
commit
b3f76b21c9
44 changed files with 106 additions and 102 deletions
|
|
@ -204,6 +204,7 @@ void Curl_bufq_skip(struct bufq *q, size_t amount);
|
|||
typedef CURLcode Curl_bufq_writer(void *writer_ctx,
|
||||
const uint8_t *buf, size_t len,
|
||||
size_t *pwritten);
|
||||
|
||||
/**
|
||||
* Passes the chunks in the buffer queue to the writer and returns
|
||||
* the amount of buf written. A writer may return -1 and CURLE_AGAIN
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ static wchar_t *fn_convert_UTF8_to_wchar(const char *str_utf8)
|
|||
}
|
||||
#endif
|
||||
|
||||
/* declare GetFullPathNameW for mingw-w64 UWP builds targeting old windows */
|
||||
/* declare GetFullPathNameW for mingw-w64 UWP builds targeting old Windows */
|
||||
#if defined(CURL_WINDOWS_UWP) && defined(__MINGW32__) && \
|
||||
(_WIN32_WINNT < _WIN32_WINNT_WIN10)
|
||||
WINBASEAPI DWORD WINAPI GetFullPathNameW(LPCWSTR, DWORD, LPWSTR, LPWSTR *);
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ static CURLcode dict_do(struct Curl_easy *data, bool *done)
|
|||
|
||||
*done = TRUE; /* unconditionally */
|
||||
|
||||
/* url-decode path before further evaluation */
|
||||
/* URL-decode path before further evaluation */
|
||||
result = Curl_urldecode(data->state.up.path, 0, &path, NULL, REJECT_CTRL);
|
||||
if(result)
|
||||
return result;
|
||||
|
|
|
|||
|
|
@ -113,10 +113,10 @@ struct ftp_conn {
|
|||
char *account;
|
||||
char *alternative_to_user;
|
||||
char *entrypath; /* the PWD reply when we logged on */
|
||||
const char *file; /* url-decoded filename (or path), points into rawpath */
|
||||
const char *file; /* URL-decoded filename (or path), points into rawpath */
|
||||
char *rawpath; /* URL decoded, allocated, version of the path */
|
||||
struct pathcomp *dirs; /* allocated array for path components */
|
||||
char *prevpath; /* url-decoded conn->path from the previous transfer */
|
||||
char *prevpath; /* URL-decoded conn->path from the previous transfer */
|
||||
char transfertype; /* set by ftp_transfertype for use by Curl_client_write()a
|
||||
and others (A/I or zero) */
|
||||
char *server_os; /* The target server operating system. */
|
||||
|
|
|
|||
|
|
@ -2857,7 +2857,7 @@ static CURLcode url_find_or_create_conn(struct Curl_easy *data)
|
|||
* remaining parts like the cloned SSL configuration. */
|
||||
result = Curl_ssl_conn_config_init(data, needle);
|
||||
if(result) {
|
||||
DEBUGF(curl_mfprintf(stderr, "Error: init connection ssl config\n"));
|
||||
DEBUGF(curl_mfprintf(stderr, "Error: init connection SSL config\n"));
|
||||
goto out;
|
||||
}
|
||||
/* attach it and no longer own it */
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ struct ssl_primary_config {
|
|||
struct ssl_config_data {
|
||||
struct ssl_primary_config primary;
|
||||
long certverifyresult; /* result from the certificate verification */
|
||||
curl_ssl_ctx_callback fsslctx; /* function to initialize ssl ctx */
|
||||
curl_ssl_ctx_callback fsslctx; /* function to initialize SSL ctx */
|
||||
void *fsslctxp; /* parameter for call back */
|
||||
BIT(certinfo); /* gather lots of certificate info */
|
||||
BIT(earlydata); /* use TLS 1.3 early data */
|
||||
|
|
@ -887,7 +887,7 @@ enum dupstring {
|
|||
STRING_SET_REFERER, /* custom string for the HTTP referer field */
|
||||
STRING_SET_URL, /* what original URL to work on */
|
||||
STRING_USERAGENT, /* User-Agent string */
|
||||
STRING_SSL_ENGINE, /* name of ssl engine */
|
||||
STRING_SSL_ENGINE, /* name of SSL engine */
|
||||
STRING_USERNAME, /* <username>, if used */
|
||||
STRING_PASSWORD, /* <password>, if used */
|
||||
STRING_OPTIONS, /* <options>, if used */
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,
|
|||
type_2_bufs[0].cbBuffer = curlx_uztoul(ntlm->input_token_len);
|
||||
|
||||
#ifdef SECPKG_ATTR_ENDPOINT_BINDINGS
|
||||
/* ssl context comes from schannel.
|
||||
/* SSL context comes from schannel.
|
||||
* When extended protection is used in IIS server,
|
||||
* we have to pass a second SecBuffer to the SecBufferDesc
|
||||
* otherwise IIS does not pass the authentication (401 response).
|
||||
|
|
|
|||
|
|
@ -191,7 +191,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
|
|||
chlg_buf[0].cbBuffer = curlx_uztoul(chlglen);
|
||||
|
||||
#ifdef SECPKG_ATTR_ENDPOINT_BINDINGS
|
||||
/* ssl context comes from Schannel.
|
||||
/* SSL context comes from Schannel.
|
||||
* When extended protection is used in IIS server,
|
||||
* we have to pass a second SecBuffer to the SecBufferDesc
|
||||
* otherwise IIS does not pass the authentication (401 response).
|
||||
|
|
|
|||
|
|
@ -973,7 +973,7 @@ static CURLcode mbed_configure_ssl(struct Curl_cfilter *cf,
|
|||
result = (*data->set.ssl.fsslctx)(data, &backend->config,
|
||||
data->set.ssl.fsslctxp);
|
||||
if(result)
|
||||
failf(data, "error signaled by ssl ctx callback");
|
||||
failf(data, "error signaled by SSL ctx callback");
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
#include "curl_trc.h"
|
||||
#include "httpsrr.h"
|
||||
#include "formdata.h" /* for the boundary function */
|
||||
#include "url.h" /* for the ssl config check function */
|
||||
#include "url.h" /* for the SSL config check function */
|
||||
#include "curlx/inet_pton.h"
|
||||
#include "vtls/openssl.h"
|
||||
#include "connect.h"
|
||||
|
|
@ -1188,13 +1188,13 @@ static int engineload(struct Curl_easy *data,
|
|||
/* Does the engine supports LOAD_CERT_CTRL ? */
|
||||
if(!ENGINE_ctrl(data->state.engine, ENGINE_CTRL_GET_CMD_FROM_NAME,
|
||||
0, CURL_UNCONST(cmd_name), NULL)) {
|
||||
failf(data, "ssl engine does not support loading certificates");
|
||||
failf(data, "SSL engine does not support loading certificates");
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Load the certificate from the engine */
|
||||
if(!ENGINE_ctrl_cmd(data->state.engine, cmd_name, 0, ¶ms, NULL, 1)) {
|
||||
failf(data, "ssl engine cannot load client cert with id '%s' [%s]",
|
||||
failf(data, "SSL engine cannot load client cert with id '%s' [%s]",
|
||||
cert_file,
|
||||
ossl_strerror(ERR_get_error(), error_buffer,
|
||||
sizeof(error_buffer)));
|
||||
|
|
@ -1202,7 +1202,7 @@ static int engineload(struct Curl_easy *data,
|
|||
}
|
||||
|
||||
if(!params.cert) {
|
||||
failf(data, "ssl engine did not initialized the certificate properly.");
|
||||
failf(data, "SSL engine did not initialized the certificate properly.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -2065,7 +2065,7 @@ static CURLcode ossl_verifyhost(struct Curl_easy *data,
|
|||
break;
|
||||
default:
|
||||
DEBUGASSERT(0);
|
||||
failf(data, "unexpected ssl peer type: %d", peer->type);
|
||||
failf(data, "unexpected SSL peer type: %d", peer->type);
|
||||
return CURLE_PEER_FAILED_VERIFICATION;
|
||||
}
|
||||
|
||||
|
|
@ -3949,7 +3949,7 @@ CURLcode Curl_ossl_ctx_init(struct ossl_ctx *octx,
|
|||
data->set.ssl.fsslctxp);
|
||||
Curl_set_in_callback(data, FALSE);
|
||||
if(result) {
|
||||
failf(data, "error signaled by ssl ctx callback");
|
||||
failf(data, "error signaled by SSL ctx callback");
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf,
|
|||
|
||||
/*
|
||||
* Get the server cert, verify it and show it, etc., only call failf() if
|
||||
* ssl config verifypeer or -host is set. Otherwise all this is for
|
||||
* SSL config verifypeer or -host is set. Otherwise all this is for
|
||||
* informational purposes only!
|
||||
*/
|
||||
CURLcode Curl_ossl_check_peer_cert(struct Curl_cfilter *cf,
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ CURLsslset Curl_init_sslset_nolock(curl_sslbackend id, const char *name,
|
|||
curl_sslbackend Curl_ssl_backend(void);
|
||||
|
||||
/**
|
||||
* Init ssl config for a new easy handle.
|
||||
* Init SSL config for a new easy handle.
|
||||
*/
|
||||
void Curl_ssl_easy_config_init(struct Curl_easy *data);
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ CURLcode Curl_ssl_peer_key_build(struct ssl_primary_config *ssl,
|
|||
char **ppeer_key);
|
||||
|
||||
/* Return if there is a session cache shall be used.
|
||||
* An ssl session might not be configured or not available for
|
||||
* An SSL session might not be configured or not available for
|
||||
* "connect-only" transfers.
|
||||
*/
|
||||
bool Curl_ssl_scache_use(struct Curl_cfilter *cf, struct Curl_easy *data);
|
||||
|
|
|
|||
|
|
@ -1440,7 +1440,7 @@ CURLcode Curl_wssl_ctx_init(struct wssl_ctx *wctx,
|
|||
result = (*data->set.ssl.fsslctx)(data, wctx->ssl_ctx,
|
||||
data->set.ssl.fsslctxp);
|
||||
if(result) {
|
||||
failf(data, "error signaled by ssl ctx callback");
|
||||
failf(data, "error signaled by SSL ctx callback");
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue