diff --git a/.github/scripts/badwords.txt b/.github/scripts/badwords.txt index 3a383ec39e..d9420790d8 100644 --- a/.github/scripts/badwords.txt +++ b/.github/scripts/badwords.txt @@ -93,3 +93,4 @@ file names\b:filenames \bmanpages[^./;=&{:-]:man pages \bmanpage[^si./;=&{:-]:man page favour:favor +basically:rephrase? diff --git a/docs/FAQ.md b/docs/FAQ.md index 78e2e573a4..f81a4ef335 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -431,10 +431,10 @@ can imagine. ## What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP? -curl adheres to the HTTP spec, which basically means you can play with *any* -protocol that is built on top of HTTP. Protocols such as SOAP, WebDAV and -XML-RPC are all such ones. You can use `-X` to set custom requests and -H to -set custom headers (or replace internally generated ones). +curl adheres to the HTTP spec, which means you can play with *any* protocol +that is built on top of HTTP. Protocols such as SOAP, WebDAV and XML-RPC are +all such ones. You can use `-X` to set custom requests and -H to set custom +headers (or replace internally generated ones). Using libcurl of course also works and you would use the proper library options to do the same. @@ -1330,9 +1330,9 @@ their projects, no matter what license they already have in use. ## What are my obligations when using libcurl in my commercial apps? Next to none. All you need to adhere to is the MIT-style license (stated in -the COPYING file) which basically says you have to include the copyright -notice in *all copies* and that you may not use the copyright holder's name -when promoting your software. +the COPYING file) which says you have to include the copyright notice in *all +copies* and that you may not use the copyright holder's name when promoting +your software. You do not have to release any of your source code. diff --git a/docs/TODO.md b/docs/TODO.md index 1d2db67a4c..e52ecb88f6 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -92,8 +92,8 @@ pings to keep such ones alive even when not actively doing transfers on them. Given a URL that for example contains spaces, libcurl could have an option that would try somewhat harder than it does now and convert spaces to %20 and -perhaps URL encoded byte values over 128 etc (basically do what the redirect -following code already does). +perhaps URL encoded byte values over 128 etc (do what the redirect following +code already does). [curl issue 514](https://github.com/curl/curl/issues/514) @@ -880,12 +880,11 @@ See [curl issue 6150](https://github.com/curl/curl/issues/6150) ## `-J` and `-O` with %-encoded filenames `-J`/`--remote-header-name` does not decode %-encoded filenames. RFC 6266 -details how it should be done. The can of worm is basically that we have no -charset handling in curl and ASCII >=128 is a challenge for us. Not to mention -that decoding also means that we need to check for nastiness that is -attempted, like `../` sequences and the like. Probably everything to the left -of any embedded slashes should be cut off. See -https://curl.se/bug/view.cgi?id=1294 +details how it should be done. The can of worm is that we have no charset +handling in curl and ASCII >=128 is a challenge for us. Not to mention that +decoding also means that we need to check for nastiness that is attempted, +like `../` sequences and the like. Probably everything to the left of any +embedded slashes should be cut off. See https://curl.se/bug/view.cgi?id=1294 `-O` also does not decode %-encoded names, and while it has even less information about the charset involved the process is similar to the `-J` diff --git a/docs/TheArtOfHttpScripting.md b/docs/TheArtOfHttpScripting.md index f50ff8f79d..41f469c112 100644 --- a/docs/TheArtOfHttpScripting.md +++ b/docs/TheArtOfHttpScripting.md @@ -201,10 +201,9 @@ Example, send two POSTs: Sometimes you need to operate on several URLs in a single command line and do different HTTP methods on each. For this, you might enjoy the -[`--next`](https://curl.se/docs/manpage.html#-:) option. It is basically a -separator that separates a bunch of options from the next. All the URLs -before `--next` get the same method and get all the POST data merged into -one. +[`--next`](https://curl.se/docs/manpage.html#-:) option. It is a separator +that separates a bunch of options from the next. All the URLs before `--next` +get the same method and get all the POST data merged into one. When curl reaches the `--next` on the command line, it resets the method and the POST data and allow a new set. diff --git a/docs/VULN-DISCLOSURE-POLICY.md b/docs/VULN-DISCLOSURE-POLICY.md index 2ea6346fd9..8878ef7acc 100644 --- a/docs/VULN-DISCLOSURE-POLICY.md +++ b/docs/VULN-DISCLOSURE-POLICY.md @@ -105,10 +105,10 @@ issues. Who is on this list? There are a couple of criteria you must meet, and then we might ask you to join the list or you can ask to join it. It really is not a -formal process. We basically only require that you have a long-term presence -in the curl project and you have shown an understanding for the project and -its way of working. You must have been around for a good while and you should -have no plans of vanishing in the near future. +formal process. We only require that you have a long-term presence in the curl +project and you have shown an understanding for the project and its way of +working. You must have been around for a good while and you should have no +plans of vanishing in the near future. We do not make the list of participants public mostly because it tends to vary somewhat over time and a list somewhere only risks getting outdated. diff --git a/docs/libcurl/libcurl-tutorial.md b/docs/libcurl/libcurl-tutorial.md index c2a409088f..6cb765dfe2 100644 --- a/docs/libcurl/libcurl-tutorial.md +++ b/docs/libcurl/libcurl-tutorial.md @@ -162,9 +162,9 @@ understanding. # Handle the Easy libcurl To use the easy interface, you must first create yourself an easy handle. You -need one handle for each easy session you want to perform. Basically, you -should use one handle for every thread you plan to use for transferring. You -must never share the same handle in multiple threads. +need one handle for each easy session you want to perform. You should use one +handle for every thread you plan to use for transferring. You must never share +the same handle in multiple threads. Get an easy handle with ~~~c @@ -794,8 +794,8 @@ CURLOPT_PROGRESSDATA(3). libcurl does not touch it. # libcurl with C++ -There is basically only one thing to keep in mind when using C++ instead of C -when interfacing libcurl: +There is only one thing to keep in mind when using C++ instead of C when +interfacing libcurl: The callbacks CANNOT be non-static class member functions @@ -931,8 +931,8 @@ for such innovative actions either! ## Proxy Auto-Config -Netscape first came up with this. It is basically a webpage (usually using a -.pac extension) with a JavaScript that when executed by the browser with the +Netscape first came up with this. It is a webpage (usually using a .pac +extension) with a JavaScript that when executed by the browser with the requested URL as input, returns information to the browser on how to connect to the URL. The returned information might be "DIRECT" (which means no proxy should be used), "PROXY host:port" (to tell the browser where the proxy for diff --git a/docs/tests/TEST-SUITE.md b/docs/tests/TEST-SUITE.md index 37d0ba4e5e..324d191fc6 100644 --- a/docs/tests/TEST-SUITE.md +++ b/docs/tests/TEST-SUITE.md @@ -275,10 +275,10 @@ New tests are added by finding a free number in `tests/data/Makefile.am`. ## Write tests -Here's a quick description on writing test cases. We basically have three -kinds of tests: the ones that test the curl tool, the ones that build small -applications and test libcurl directly and the unit tests that test -individual (possibly internal) functions. +Here's a quick description on writing test cases. We have three kinds of +tests: the ones that test the curl tool, the ones that build small +applications and test libcurl directly and the unit tests that test individual +(possibly internal) functions. ### test data diff --git a/include/curl/curl.h b/include/curl/curl.h index 40c298c382..0ab405efe9 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -3099,11 +3099,10 @@ typedef enum { CURLVERSION_LAST /* never actually use this */ } CURLversion; -/* The 'CURLVERSION_NOW' is the symbolic name meant to be used by - basically all programs ever that want to get version information. It is - meant to be a built-in version number for what kind of struct the caller - expects. If the struct ever changes, we redefine the NOW to another enum - from above. */ +/* The 'CURLVERSION_NOW' is the symbolic name meant to be used by programs + that want to get version information. It is meant to be a built-in + version number for what kind of struct the caller expects. If the struct + ever changes, we redefine the NOW to another enum from above. */ #define CURLVERSION_NOW CURLVERSION_TWELFTH struct curl_version_info_data { diff --git a/lib/cf-socket.c b/lib/cf-socket.c index feaf2187cb..075ec59dee 100644 --- a/lib/cf-socket.c +++ b/lib/cf-socket.c @@ -266,11 +266,11 @@ static CURLcode sock_assign_addr(struct Curl_sockaddr_ex *dest, uint8_t transport) { /* - * The Curl_sockaddr_ex structure is basically libcurl's external API - * curl_sockaddr structure with enough space available to directly hold - * any protocol-specific address structures. The variable declared here - * will be used to pass / receive data to/from the fopensocket callback - * if this has been set, before that, it is initialized from parameters. + * The Curl_sockaddr_ex structure is libcurl's external API curl_sockaddr + * structure with enough space available to directly hold any + * protocol-specific address structures. The variable declared here will be + * used to pass / receive data to/from the fopensocket callback if this has + * been set, before that, it is initialized from parameters. */ dest->family = ai->ai_family; switch(transport) { diff --git a/lib/cf-socket.h b/lib/cf-socket.h index 298ced9269..014f5f7881 100644 --- a/lib/cf-socket.h +++ b/lib/cf-socket.h @@ -35,8 +35,8 @@ struct Curl_sockaddr_ex; struct ip_quadruple; /* - * The Curl_sockaddr_ex structure is basically libcurl's external API - * curl_sockaddr structure with enough space available to directly hold any + * The Curl_sockaddr_ex structure is libcurl's external API curl_sockaddr + * structure with enough space available to directly hold any * protocol-specific address structures. The variable declared here will be * used to pass / receive data to/from the fopensocket callback if this has * been set, before that, it is initialized from parameters. diff --git a/lib/ftp.c b/lib/ftp.c index b50d9976c3..8ff810ac8b 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -2264,8 +2264,7 @@ static CURLcode ftp_statemach(struct Curl_easy *data, * connected. * * 'complete' can return 0 for incomplete, 1 for done and -1 for go back - * (which basically is only for when PASV is being sent to retry a failed - * EPSV). + * (which is for when PASV is being sent to retry a failed EPSV). */ static CURLcode ftp_do_more(struct Curl_easy *data, int *completep) { diff --git a/lib/http.c b/lib/http.c index 9de27ba629..d2f85fc5bf 100644 --- a/lib/http.c +++ b/lib/http.c @@ -974,9 +974,8 @@ static CURLcode auth_basic(struct Curl_easy *data, *availp |= CURLAUTH_BASIC; authp->avail |= CURLAUTH_BASIC; if(authp->picked == CURLAUTH_BASIC) { - /* We asked for Basic authentication but got a 40X back - anyway, which basically means our name+password is not - valid. */ + /* We asked for Basic authentication but got a 40X back anyway, which + means our name+password is not valid. */ authp->avail = CURLAUTH_NONE; infof(data, "Basic authentication problem, ignoring."); data->state.authproblem = TRUE; @@ -993,8 +992,8 @@ static CURLcode auth_bearer(struct Curl_easy *data, *availp |= CURLAUTH_BEARER; authp->avail |= CURLAUTH_BEARER; if(authp->picked == CURLAUTH_BEARER) { - /* We asked for Bearer authentication but got a 40X back - anyway, which basically means our token is not valid. */ + /* We asked for Bearer authentication but got a 40X back anyway, which + means our token is not valid. */ authp->avail = CURLAUTH_NONE; infof(data, "Bearer authentication problem, ignoring."); data->state.authproblem = TRUE; diff --git a/lib/multi.c b/lib/multi.c index 5a2f7187ff..d4ebcb42cd 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -693,10 +693,10 @@ static CURLcode multi_done(struct Curl_easy *data, case CURLE_ABORTED_BY_CALLBACK: case CURLE_READ_ERROR: case CURLE_WRITE_ERROR: - /* When we are aborted due to a callback return code it basically have to - be counted as premature as there is trouble ahead if we do not. We have - many callbacks and protocols work differently, we could potentially do - this more fine-grained in the future. */ + /* When we are aborted due to a callback return code it has to be counted + as premature as there is trouble ahead if we do not. We have many + callbacks and protocols work differently, we could potentially do this + more fine-grained in the future. */ premature = TRUE; FALLTHROUGH(); default: @@ -1694,9 +1694,9 @@ static CURLcode multi_do(struct Curl_easy *data, bool *done) } /* - * multi_do_more() is called during the DO_MORE multi state. It is basically a - * second stage DO state which (wrongly) was introduced to support FTP's - * second connection. + * multi_do_more() is called during the DO_MORE multi state. It is a second + * stage DO state which (wrongly) was introduced to support FTP's second + * connection. * * 'complete' can return 0 for incomplete, 1 for done and -1 for go back to * DOING state there is more work to do! diff --git a/lib/tftp.c b/lib/tftp.c index 6bc6f0f473..cc0769bbb3 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -935,8 +935,8 @@ static CURLcode tftp_connect(struct Curl_easy *data, bool *done) return CURLE_OUT_OF_MEMORY; } - /* we do not keep TFTP connections up basically because there is none or - * little gain for UDP */ + /* we do not keep TFTP connections up because there is none or little gain + * for UDP */ connclose(conn, "TFTP"); state->data = data; diff --git a/lib/transfer.c b/lib/transfer.c index d9909c494b..6dd2f52fe5 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -574,8 +574,7 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) /* * Set user-agent. Used for HTTP, but since we can attempt to tunnel - * basically anything through an HTTP proxy we cannot limit this based on - * protocol. + * anything through an HTTP proxy we cannot limit this based on protocol. */ if(!result && data->set.str[STRING_USERAGENT]) { curlx_free(data->state.aptr.uagent); diff --git a/lib/urldata.h b/lib/urldata.h index ff8e2cc085..23d8bbe74b 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -514,8 +514,8 @@ struct Curl_scheme { const struct Curl_protocol *run; /* implementation */ curl_prot_t protocol; /* See CURLPROTO_* - this needs to be the single specific protocol bit */ - curl_prot_t family; /* single bit for protocol family; basically the - non-TLS name of the protocol this is */ + curl_prot_t family; /* single bit for protocol family; the non-TLS name + of the protocol this is */ uint32_t flags; /* Extra particular characteristics, see PROTOPT_* */ uint16_t defport; /* Default port. */ }; diff --git a/tests/server/sws.c b/tests/server/sws.c index 5de572d1c6..8d4b0b27da 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -1984,7 +1984,7 @@ static int test_sws(int argc, const char *argv[]) int keepalive_secs = 5; const char *protocol_type = "HTTP"; - /* a default CONNECT port is basically pointless but still ... */ + /* a default CONNECT port is pointless, but still ... */ size_t socket_idx; pidname = ".http.pid";