Skip to content

Commit 466b358

Browse files
committed
Reveerting 2604af9
1 parent 2604af9 commit 466b358

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

Changelog

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ Version Changes for Hypermail
55
HYPERMAIL VERSION 2.4.1:
66
============================
77

8-
2020-08-27 Jose Kahan
9-
* src/string.c
10-
extended parseurl() in a naive approach for supporting U+00A0
11-
nonbreakable space inside sscanf. This function should eventually be
12-
rewritten to use libpcre
13-
148
2020-06-19 Jose Kahan
159
* src/domains.c
1610
valid_root_domains() was validating a domain name against the

src/string.c

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1941,19 +1941,10 @@ char *parseurl(char *input, char *charset)
19411941
&& ((istelprotocol && (*inputp == '+' || isdigit(*inputp)))
19421942
|| (!istelprotocol && !ispunct(*inputp)))) {
19431943

1944-
if (set_iso2022jp) {
1945-
if (charset && !strncasecmp(charset, "UTF-8", 5)) {
1946-
urlscan = sscanf(inputp, "%255[^] \u00a0\033)<>\"\'\n[\t\\]", urlbuff);
1947-
} else {
1948-
urlscan = sscanf(inputp, "%255[^] \033)<>\"\'\n[\t\\]", urlbuff);
1949-
}
1950-
} else {
1951-
if (charset && !strncasecmp(charset, "UTF-8", 5)) {
1952-
urlscan = sscanf(inputp, "%255[^] \u00a0)<>\"\'\n[\t\\]", urlbuff);
1953-
} else {
1954-
urlscan = sscanf(inputp, "%255[^] )<>\"\'\n[\t\\]", urlbuff);
1955-
}
1956-
}
1944+
if (set_iso2022jp)
1945+
urlscan = sscanf(inputp, "%255[^] \033)<>\"\'\n[\t\\]", urlbuff);
1946+
else
1947+
urlscan = sscanf(inputp, "%255[^] )<>\"\'\n[\t\\]", urlbuff);
19571948
}
19581949

19591950
if (urlscan == 1) {

0 commit comments

Comments
 (0)