Skip to content

Commit 828f998

Browse files
vszakatsvszakats
committed
spacecheck.pl: drop more exceptions
- replace ß (scharfes S) with links. - replace § (section sign) with links. - replace 🙏 emoji with `:pray:`. Supported by GitHub, Forgejo/Gitea and most likely GitLab. - docs/libcurl/curl_mprintf.md: replace Unicode ± with `{+|-}`. - docs/CIPHERS.md: URL encode Unicode in URLs. - lib1560: use hex encoding in `räksmörgås.se`. - unit1307: use hex encoding in `Lindmätarv`. - drop LATIN SMALL LETTER A WITH ACUTE exception. No longer appears in tests. This leaves the single character exception: `ö` And file exceptions holding contributor names. Follow-up to 9243ed5 curl#17329 Follow-up to 838dc53 curl#17247 Closes curl#17335
1 parent 4efeeaa commit 828f998

File tree

8 files changed

+25
-23
lines changed

8 files changed

+25
-23
lines changed

‎.github/scripts/spacecheck.pl‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,7 @@
4848
);
4949

5050
my @non_ascii_allowed = (
51-
'\xC3\xA1', # UTF-8 for https://codepoints.net/U+00E1 LATIN SMALL LETTER A WITH ACUTE
52-
'\xC3\xA5', # UTF-8 for https://codepoints.net/U+00E5 LATIN SMALL LETTER A WITH RING ABOVE
53-
'\xC3\xA4', # UTF-8 for https://codepoints.net/U+00E4 LATIN SMALL LETTER A WITH DIAERESIS
54-
'\xC3\xB6', # UTF-8 for https://codepoints.net/U+00F6 LATIN SMALL LETTER O WITH DIAERESIS
55-
'\xC2\xB1', # UTF-8 for https://codepoints.net/U+00B1 PLUS-MINUS SIGN
56-
'\xC2\xA7', # UTF-8 for https://codepoints.net/U+00A7 SECTION SIGN
57-
'\xC3\x9F', # UTF-8 for https://codepoints.net/U+00DF LATIN SMALL LETTER SHARP S
58-
'\xF0\x9F\x99\x8F', # UTF-8 for https://codepoints.net/U+1f64f PERSON WITH FOLDED HANDS
51+
'\xC3\xB6', # UTF-8 for https://codepoints.net/U+00F6 LATIN SMALL LETTER O WITH DIAERESIS
5952
);
6053

6154
my $non_ascii_allowed = join(', ', @non_ascii_allowed);
@@ -65,7 +58,6 @@
6558
".mailmap",
6659
"RELEASE-NOTES",
6760
"docs/BINDINGS.md",
68-
"docs/CIPHERS.md",
6961
"docs/THANKS",
7062
"docs/THANKS-filter",
7163
);

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ distribution terms.
6161

6262
## Backers
6363

64-
Thank you to all our backers 🙏 [Become a backer](https://opencollective.com/curl#section-contribute).
64+
Thank you to all our backers :pray: [Become a backer](https://opencollective.com/curl#section-contribute).
6565

6666
## Sponsors
6767

‎docs/CIPHERS.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ are names for specific combinations of
1818
and with TLSv1.3 the
1919
[authenticated encryption](https://en.wikipedia.org/wiki/Authenticated_encryption).
2020
In addition, there are other parameters that influence the TLS handshake, like
21-
[DHE](https://en.wikipedia.org/wiki/Diffie–Hellman_key_exchange) "groups" and
22-
[ECDHE](https://en.wikipedia.org/wiki/Elliptic-curve_Diffie–Hellman) with its
23-
"curves".
21+
[DHE](https://en.wikipedia.org/wiki/Diffie%e2%80%93Hellman_key_exchange) "groups"
22+
and [ECDHE](https://en.wikipedia.org/wiki/Elliptic-curve_Diffie%e2%80%93Hellman)
23+
with its "curves".
2424

2525
### History
2626

‎docs/KNOWN_BUGS‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ problems may have been fixed or changed somewhat since this was written.
4646
6. Authentication
4747
6.2 MIT Kerberos for Windows build
4848
6.3 NTLM in system context uses wrong name
49-
6.5 NTLM does not support password with § character
49+
6.5 NTLM does not support password with Unicode 'SECTION SIGN' character
5050
6.6 libcurl can fail to try alternatives with --proxy-any
5151
6.7 Do not clear digest for single realm
5252
6.8 Heimdal memory leaks
@@ -318,8 +318,10 @@ problems may have been fixed or changed somewhat since this was written.
318318
"system context" makes it use wrong(?) username - at least when compared to
319319
what winhttp does. See https://curl.se/bug/view.cgi?id=535
320320

321-
6.5 NTLM does not support password with § character
321+
6.5 NTLM does not support password with Unicode 'SECTION SIGN' character
322322

323+
https://en.wikipedia.org/wiki/Section_sign
324+
https://codepoints.net/U+00A7 SECTION SIGN
323325
https://github.com/curl/curl/issues/2120
324326

325327
6.6 libcurl can fail to try alternatives with --proxy-any

‎docs/URL-SYNTAX.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,9 @@ handle hostnames using non-ASCII characters.
194194
When built with libidn2, curl uses the IDNA 2008 standard. This is equivalent
195195
to the WHATWG URL spec, but differs from certain browsers that use IDNA 2003
196196
Transitional Processing. The two standards have a huge overlap but differ
197-
slightly, perhaps most famously in how they deal with the German "double s"
198-
(`ß`).
197+
slightly, perhaps most famously in how they deal with the
198+
[German "double s"](https://en.wikipedia.org/wiki/%c3%9f)
199+
([LATIN SMALL LETTER SHARP S](https://codepoints.net/U+00DF)).
199200

200201
When WinIDN is used, curl uses IDNA 2003 Transitional Processing, like the rest
201202
of Windows.

‎docs/libcurl/curl_mprintf.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ printed with an explicit precision 0, the output is empty.
226226
227227
## e, E
228228
229-
The double argument is rounded and output in the style **"[-]d.ddde±dd"**
229+
The double argument is rounded and output in the style **"[-]d.ddde{+|-}dd"**
230230
231231
## f, F
232232

‎tests/libtest/lib1560.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,20 @@ static const struct testcase get_parts_list[] ={
202202
"| [16] | [17]",
203203
0, CURLU_URLDECODE, CURLUE_OK },
204204
#ifdef USE_IDN
205-
{"https://räksmörgås.se",
205+
/*
206+
https://sv.wikipedia.org/wiki/R%c3%a4ksm%c3%b6rg%c3%a5s
207+
https://codepoints.net/U+00E4 Latin Small Letter A with Diaeresis
208+
https://codepoints.net/U+00F6 Latin Small Letter O with Diaeresis
209+
https://codepoints.net/U+00E5 Latin Small Letter A with Ring Above
210+
*/
211+
{"https://r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se",
206212
"https | [11] | [12] | [13] | xn--rksmrgs-5wao1o.se | "
207213
"[15] | / | [16] | [17]", 0, CURLU_PUNYCODE, CURLUE_OK},
208214
{"https://xn--rksmrgs-5wao1o.se",
209-
"https | [11] | [12] | [13] | räksmörgås.se | "
215+
"https | [11] | [12] | [13] | r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se | "
210216
"[15] | / | [16] | [17]", 0, CURLU_PUNY2IDN, CURLUE_OK},
211217
#else
212-
{"https://räksmörgås.se",
218+
{"https://r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se",
213219
"https | [11] | [12] | [13] | [30] | [15] | / | [16] | [17]",
214220
0, CURLU_PUNYCODE, CURLUE_OK},
215221
#endif
@@ -619,7 +625,7 @@ static const struct urltestcase get_url_list[] = {
619625
"",
620626
0, 0, CURLUE_BAD_PORT_NUMBER},
621627
#ifdef USE_IDN
622-
{"https://räksmörgås.se/path?q#frag",
628+
{"https://r\xc3\xa4ksm\xc3\xb6rg\xc3\xa5s.se/path?q#frag",
623629
"https://xn--rksmrgs-5wao1o.se/path?q#frag", 0, CURLU_PUNYCODE, CURLUE_OK},
624630
#endif
625631
/* unsupported schemes with no guessing enabled */

‎tests/unit/unit1307.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ static const struct testcase tests[] = {
243243
{ "?*?*?.?", "abcdef.c", MATCH },
244244
{ "?*?*?.?", "abcdef.cd", NOMATCH },
245245

246-
{ "Lindmätarv", "Lindmätarv", MATCH },
246+
/* https://codepoints.net/U+00E4 Latin Small Letter A with Diaeresis */
247+
{ "Lindm\xc3\xa4tarv", "Lindm\xc3\xa4tarv", MATCH },
247248

248249
{ "", "", MATCH},
249250
{"**]*[*[\x13]**[*\x13)]*]*[**[*\x13~r-]*]**[.*]*[\xe3\xe3\xe3\xe3\xe3\xe3"

0 commit comments

Comments
 (0)