summaryrefslogtreecommitdiff
path: root/module
diff options
context:
space:
mode:
authorDale P. Smith <dalepsmith@gmail.com>2022-01-27 19:20:57 -0500
committerArne Babenhauserheide <arne_bab@web.de>2025-03-02 21:18:19 +0100
commit29c27afe96ac6eccc42607be57c285ba912af28f (patch)
tree7495c3ff73f173ebdc5bae701a9e336f48c52046 /module
parent5be5a10a8a56287a5a740580c40b8413e9fff796 (diff)
downloadguile-29c27afe96ac6eccc42607be57c285ba912af28f.tar.gz
Allow trailing "." in urls
Fixes https://debbugs.gnu.org/53201 * module/web/uri.scm (valid-host?): Allow trailing "." in URLs * test-suite/tests/web-uri.test: Add tests for trailing "."
Diffstat (limited to 'module')
-rw-r--r--module/web/uri.scm17
1 files changed, 10 insertions, 7 deletions
diff --git a/module/web/uri.scm b/module/web/uri.scm
index 8e0b9bee7..8c5c0d6f0 100644
--- a/module/web/uri.scm
+++ b/module/web/uri.scm
@@ -206,13 +206,16 @@ for ‘build-uri’ except there is no scheme."
((regexp-exec ipv6-regexp host)
(false-if-exception (inet-pton AF_INET6 host)))
(else
- (let lp ((start 0))
- (let ((end (string-index host #\. start)))
- (if end
- (and (regexp-exec domain-label-regexp
- (substring host start end))
- (lp (1+ end)))
- (regexp-exec top-label-regexp host start)))))))
+ (let ((last (1- (string-length host))))
+ (let lp ((start 0))
+ (let ((end (string-index host #\. start)))
+ (if (and end (< end last))
+ (and (regexp-exec domain-label-regexp
+ (substring host start end))
+ (lp (1+ end)))
+ (if end
+ (regexp-exec top-label-regexp (substring host start end))
+ (regexp-exec top-label-regexp host start)))))))))
(define userinfo-pat
(string-append "[" letters digits "_.!~*'();:&=+$,-]+"))