romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 16:23:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

tidy-up: miscellaneous

Browse source 
- `N byte` -> `N-byte` or `N bytes`.
- INTERNALS.md: language tweaks.
- schannel: language tweak in comment/error message.
- socks_gssapi, socks_sspi: simplify composing an error message.
  (at a cost of 8 extra constant string bytes.)
- m4/curl-compilers.m4: fix typo in link (in comment).
- contrithanks.sh: fix indent, drop stray `;` terminator.
- lib, src, tests: drop/fix a bunch of badwords.
- fix typos in comments.
- fix indent, stray spaces.

Some of these spotted by GitHub Code Quality and Copilot

Closes #22009
This commit is contained in:
Viktor Szakats 2026-06-12 00:33:40 +02:00
parent 5bff1c35f1
commit 0ffab25b6c
No known key found for this signature in database
158 changed files with 357 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/data/test1063
View file

@ -20,7 +20,7 @@ Largefile
<name>
Invalid large X- range on a file://
</name>
# This range value is 2**32 + 7, which will be truncated to the valid value 7
# This range value is 2**32 + 7, which is truncated to the valid value 7
# if the large file support is not working correctly
<command>
-r 4294967303- file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt

2
tests/data/test1130
View file

@ -32,7 +32,7 @@ Content-Type: text/html
# We use skip to make the test server never read the full payload off
# the socket and instead return the response at once. In actuality, the
# long --expect100-timeout means that it will never get a chance to read this.
# long --expect100-timeout means that it never gets a chance to read this.
<servercmd>
skip: 100
</servercmd>

2
tests/data/test1131
View file

@ -32,7 +32,7 @@ FAILURE2
# We use skip to make the test server never read the full payload off
# the socket and instead return the response at once. In actuality, the
# long --expect100-timeout means that it will never get a chance to read this.
# long --expect100-timeout means that it never gets a chance to read this.
<servercmd>
skip: 100
</servercmd>

2
tests/data/test1238
View file

@ -14,7 +14,7 @@ DELAY
<servercmd>
writedelay: 2000
</servercmd>
# ~1200 bytes (so that they do not fit in two 512 byte chunks)
# ~1200 bytes (so that they do not fit in two 512-byte chunks)
<data nocheck="yes">
012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
</data>

4
tests/data/test1349
View file

@ -47,8 +47,8 @@ fooo
mooo
</file1>
# The final "221 bye bye baby" response to QUIT will not be recorded
# since that is not considered part of this particular transfer!
# The final "221 bye bye baby" response to QUIT is not recorded
# since that is not considered part of this particular transfer.
<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
220- _ _ ____ _
220- ___| | | | _ \| |

4
tests/data/test1350
View file

@ -47,8 +47,8 @@ fooo
mooo
</file1>
# The final "221 bye bye baby" response to QUIT will not be recorded
# since that is not considered part of this particular transfer!
# The final "221 bye bye baby" response to QUIT is not recorded
# since that is not considered part of this particular transfer.
<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
220- _ _ ____ _
220- ___| | | | _ \| |

4
tests/data/test1351
View file

@ -48,8 +48,8 @@ fooo
mooo
</file1>
# The final "221 bye bye baby" response to QUIT will not be recorded
# since that is not considered part of this particular transfer!
# The final "221 bye bye baby" response to QUIT is not recorded
# since that is not considered part of this particular transfer.
<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
220- _ _ ____ _
220- ___| | | | _ \| |

4
tests/data/test1352
View file

@ -48,8 +48,8 @@ fooo
mooo
</file1>
# The final "221 bye bye baby" response to QUIT will not be recorded
# since that is not considered part of this particular transfer!
# The final "221 bye bye baby" response to QUIT is not recorded
# since that is not considered part of this particular transfer.
<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
220- _ _ ____ _
220- ___| | | | _ \| |

4
tests/data/test1353
View file

@ -47,8 +47,8 @@ fooo
mooo
</file1>
# The final "221 bye bye baby" response to QUIT will not be recorded
# since that is not considered part of this particular transfer!
# The final "221 bye bye baby" response to QUIT is not recorded
# since that is not considered part of this particular transfer.
<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
220- _ _ ____ _
220- ___| | | | _ \| |

2
tests/data/test1412
View file

@ -26,7 +26,7 @@ Connection: close
This is not the real page
</data>
# The second URL will get this response
# The second URL gets this response
<data1 crlf="headers">
HTTP/1.1 401 Authorization Required swsclose
Server: Apache/1.3.27 (Darwin) PHP/4.1.2

2
tests/data/test1513
View file

@ -30,7 +30,7 @@ lib%TESTNUMBER
return failure immediately from progress callback
</name>
# this server/host will not be used for real
# this server/host is not used for real
<command>
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
</command>

2
tests/data/test1515
View file

@ -10,7 +10,7 @@ resolve
</info>
<reply>
# Close the connection after the first request. Second request will happen after
# Close the connection after the first request. Second request happens after
# the DNS cache timeout elapses and must succeed exactly like the first one.
<data1>
HTTP/1.1 200 OK

2
tests/data/test153
View file

@ -56,7 +56,7 @@ Content-Length: 26
This is not the real page
</data1002>
# The second request to the 1002 section will bounce this one back instead
# The second request to the 1002 section bounces this one back instead
# thanks to the swsbounce keyword up there
<data1003 crlf="headers">
HTTP/1.1 200 OK

2
tests/data/test1555
View file

@ -30,7 +30,7 @@ lib%TESTNUMBER
verify api is protected against calls from callbacks
</name>
# this server/host will not be used for real
# this server/host is not used for real
<command>
http://%HOSTIP:%HTTPPORT/%TESTNUMBER
</command>

2
tests/data/test1628
View file

@ -27,7 +27,7 @@ proxy
http
</server>
<name>
HTTP PUT from file with weird letters over a HTTP proxy
HTTP PUT from file with weird letters over an HTTP proxy
</name>
<command>
-x http://%HOSTIP:%HTTPPORT http://ssss/ -T %LOGDIR/%TESTNUMBERte[]st.txt

4
tests/data/test1631
View file

@ -56,8 +56,8 @@ proxy
# Verify data after the test has been "shot"
<verify>
# The second CONNECT will be made to the dynamic port number the FTP server
# opens for us, so we cannot compare with a known pre-existing number!
# The second CONNECT is made to the dynamic port number the FTP server
# opens for us, so we cannot compare with a known pre-existing number.
<strippart>
s/((https.proxy):(\d+))/$2:12345/
</strippart>

4
tests/data/test1632
View file

@ -65,8 +65,8 @@ proxy
# Verify data after the test has been "shot"
<verify>
# The second and third CONNECT will be made to the dynamic port number the FTP
# server opens for us, so we cannot compare with known pre-existing numbers!
# The second and third CONNECTs are made to the dynamic port number the FTP
# server opens for us, so we cannot compare with known pre-existing numbers.
<strippart>
s/((https.proxy):(\d+))/$2:12345/

4
tests/data/test2045
View file

@ -11,13 +11,13 @@ FTP
<reply>
# The purpose of this test is to make sure the --proto-default option works
# properly. We specify a default protocol of FTP and if the option works properly
# curl will use the FTP protocol. If the option is broken however curl will use
# curl uses the FTP protocol. If the option is broken however curl uses
# the HTTP protocol.
# In the broken scenario curl would use HTTP to talk to our FTP server. We handle
# that by replying with something that both protocols can understand. Our FTP
# server allows a custom welcome message, so we use that feature to make an HTTP
# reply that contains an FTP reply (think polyglot). In the case of FTP we expect
# curl will return CURLE_WEIRD_SERVER_REPLY so we test for that return code.
# curl to return CURLE_WEIRD_SERVER_REPLY so we test for that return code.
<servercmd>
REPLY welcome HTTP/1.1 200 OK\r\nContent-Length: 21\r\n\r\n500 Weird FTP Reply
</servercmd>

2
tests/data/test2206
View file

@ -15,7 +15,7 @@ hello
# Send a PINGRESP (0xD0) with remaining_length=2 in place of the
# expected CONNACK. MQTT 3.1.1 s. 3.13.1 requires PINGRESP to have
# remaining_length == 0. Curl must reject this with
# remaining_length == 0. curl must reject this with
# CURLE_WEIRD_SERVER_REPLY rather than dispatching to the CONNACK
# handler.
<servercmd>

2
tests/data/test2207
View file

@ -15,7 +15,7 @@ hello
# Send a DISCONNECT with remaining_length=2 after the PUBLISH.
# MQTT 3.1.1 s. 3.14.1 requires DISCONNECT to have remaining_length == 0.
# Curl must reject this with CURLE_WEIRD_SERVER_REPLY.
# curl must reject this with CURLE_WEIRD_SERVER_REPLY.
<servercmd>
DISCONNECT-malformed TRUE
</servercmd>

2
tests/data/test2302
View file

@ -6,7 +6,7 @@ WebSockets
</keywords>
</info>
# Sends a PING + a 5 byte hello TEXT
# Sends a PING + a 5-byte hello TEXT
<reply>
<data crlf="headers" nocheck="yes" nonewline="yes">
HTTP/1.1 101 Switching to WebSockets

2
tests/data/test2713
View file

@ -34,7 +34,7 @@ upgrade
</servercmd>
# Full list of frames: see 'verify.stdout' below
# A 126 byte long PING
# A 126-byte-long PING
<data nocheck="yes" nonewline="yes">
HTTP/1.1 101 Switching to WebSockets
Server: server/%TESTNUMBER

2
tests/data/test2714
View file

@ -34,7 +34,7 @@ upgrade
</servercmd>
# Full list of frames: see 'verify.stdout' below
# A 126 byte long PONG
# A 126-byte-long PONG
<data nocheck="yes" nonewline="yes">
HTTP/1.1 101 Switching to WebSockets
Server: server/%TESTNUMBER

2
tests/data/test2715
View file

@ -34,7 +34,7 @@ upgrade
</servercmd>
# Full list of frames: see 'verify.stdout' below
# A 126 byte long CLOSE
# A 126-byte-long CLOSE
<data nocheck="yes" nonewline="yes">
HTTP/1.1 101 Switching to WebSockets
Server: server/%TESTNUMBER

4
tests/data/test284
View file

@ -11,7 +11,7 @@ TFTP RRQ
<reply>
<data>
A chunk of data which exactly fits into
a 512 byte TFTP block, testing a boundary
a 512-byte TFTP block, testing a boundary
condition in the TFTP receive code.
789ABCDEF
123456789ABCDEF
@ -47,7 +47,7 @@ condition in the TFTP receive code.
tftp
</server>
<name>
TFTP retrieve of boundary case 512 byte file
TFTP retrieve of boundary case 512-byte file
</name>
<command>
tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER

6
tests/data/test286
View file

@ -13,14 +13,14 @@ TFTP WRQ
tftp
</server>
<name>
TFTP send of boundary case 512 byte file
TFTP send of boundary case 512-byte file
</name>
<command>
-T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
</command>
<file name="%LOGDIR/test%TESTNUMBER.txt">
A chunk of data which exactly fits into
a 512 byte TFTP block, testing a boundary
a 512-byte TFTP block, testing a boundary
condition in the TFTP transmit code.
89ABCDEF
123456789ABCDEF
@ -54,7 +54,7 @@ condition in the TFTP transmit code.
<verify>
<upload>
A chunk of data which exactly fits into
a 512 byte TFTP block, testing a boundary
a 512-byte TFTP block, testing a boundary
condition in the TFTP transmit code.
89ABCDEF
123456789ABCDEF

2
tests/data/test388
View file

@ -56,7 +56,7 @@ Content-Length: 26
This is not the real page
</data1002>
# The second request to the 1002 section will bounce this one back instead
# The second request to the 1002 section bounces this one back instead
# thanks to the swsbounce keyword up there
<data1003 crlf="headers">
HTTP/1.1 200 OK

2
tests/data/test399
View file

@ -12,7 +12,7 @@ URL
http
</server>
<name>
65536 bytes long hostname in URL
65536-byte-long hostname in URL
</name>
<file name="%LOGDIR/input%TESTNUM">
url = http://%repeat[65536 x a]%/399

2
tests/data/test741
View file

@ -22,7 +22,7 @@ http
HOME=%PWD/%LOGDIR
</setenv>
<name>
IPFS malformed gw URL from multiline gateway file, first line no url
IPFS malformed gw URL from multiline gateway file, first line no URL
</name>
<command>
ipfs://bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u

2
tests/data/test743
View file

@ -31,7 +31,7 @@ Funny-head: yesyes
http
</server>
<name>
--config with a 127 byte line
--config with a 127-byte line
</name>
<file name="%LOGDIR/config" nonewline="yes">
-A pointless

2
tests/data/test744
View file

@ -45,7 +45,7 @@ http
http-proxy
</server>
<name>
--netrc-file with a 127 byte line
--netrc-file with a 127-byte line
</name>
<file name="%LOGDIR/netrc%TESTNUMBER" nonewline="yes">
machine foo.host login foo password baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar

2
tests/data/test830
View file

@ -44,7 +44,7 @@ IMAP CRAM-MD5 graceful cancellation
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "LOGOUT"
# transfer and such a connection does not get a "LOGOUT"
<protocol crlf="yes">
A001 CAPABILITY
A002 AUTHENTICATE CRAM-MD5

2
tests/data/test831
View file

@ -45,7 +45,7 @@ IMAP NTLM graceful cancellation
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "LOGOUT"
# transfer and such a connection does not get a "LOGOUT"
<protocol crlf="yes">
A001 CAPABILITY
A002 AUTHENTICATE NTLM

2
tests/data/test832
View file

@ -46,7 +46,7 @@ IMAP DIGEST-MD5 graceful cancellation
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "LOGOUT"
# transfer and such a connection does not get a "LOGOUT"
<protocol crlf="yes">
A001 CAPABILITY
A002 AUTHENTICATE DIGEST-MD5

2
tests/data/test844
View file

@ -39,7 +39,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "LOGOUT"
# transfer and such a connection does not get a "LOGOUT"
<protocol crlf="yes">
A001 CAPABILITY
A002 AUTHENTICATE OAUTHBEARER

2
tests/data/test845
View file

@ -41,7 +41,7 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "LOGOUT"
# transfer and such a connection does not get a "LOGOUT"
<protocol crlf="yes">
A001 CAPABILITY
A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%

2
tests/data/test849
View file

@ -38,7 +38,7 @@ IMAP plain auth with alt authorization identity (Not authorized)
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "LOGOUT"
# transfer and such a connection does not get a "LOGOUT"
<protocol crlf="yes">
A001 CAPABILITY
A002 AUTHENTICATE PLAIN

2
tests/data/test856
View file

@ -34,7 +34,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:wrong
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
CAPA
USER user

2
tests/data/test876
View file

@ -45,7 +45,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
CAPA
AUTH CRAM-MD5

2
tests/data/test877
View file

@ -46,7 +46,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
CAPA
AUTH NTLM

2
tests/data/test878
View file

@ -47,7 +47,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
CAPA
AUTH DIGEST-MD5

2
tests/data/test889
View file

@ -42,7 +42,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
CAPA
AUTH OAUTHBEARER

2
tests/data/test890
View file

@ -42,7 +42,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
CAPA
AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%

2
tests/data/test893
View file

@ -40,7 +40,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u kurt:xipj3plmq --sasl-authzid ursel
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
CAPA
AUTH PLAIN

2
tests/data/test932
View file

@ -44,7 +44,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
EHLO %TESTNUMBER
AUTH CRAM-MD5

2
tests/data/test933
View file

@ -45,7 +45,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
EHLO %TESTNUMBER
AUTH NTLM

2
tests/data/test934
View file

@ -46,7 +46,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
EHLO %TESTNUMBER
AUTH DIGEST-MD5

2
tests/data/test948
View file

@ -45,7 +45,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
EHLO %TESTNUMBER
AUTH OAUTHBEARER

2
tests/data/test949
View file

@ -44,7 +44,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
EHLO %TESTNUMBER
AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%

2
tests/data/test954
View file

@ -42,7 +42,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-fr
67
</errorcode>
# The multi interface considers a broken "CONNECT" as a prematurely broken
# transfer and such a connection will not get a "QUIT"
# transfer and such a connection does not get a "QUIT"
<protocol crlf="yes">
EHLO %TESTNUMBER
AUTH PLAIN