(define ipv4-regexp
(make-regexp "^([0-9.]+)$"))
(define ipv6-regexp
- (make-regexp "^\\[([0-9a-fA-F:]+)\\]$"))
+ (make-regexp "^\\[([0-9a-fA-F:.]+)\\]$"))
(define domain-label-regexp
(make-regexp "^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?$"))
(define top-label-regexp
(define userinfo-pat
"[a-zA-Z0-9_.!~*'();:&=+$,-]+")
(define host-pat
- "[a-zA-Z0-9.-]+")
+ "[a-zA-Z0-9.-]+|\\[[0-9a-FA-F:.]+\\]")
(define port-pat
"[0-9]*")
(define authority-regexp
(uri=? (build-uri 'http #:host "[2001:db8::1]")
#:scheme 'http #:host "[2001:db8::1]" #:path ""))
+ (pass-if "http://[::ffff:192.0.2.1]"
+ (uri=? (build-uri 'http #:host "[::ffff:192.0.2.1]")
+ #:scheme 'http #:host "[::ffff:192.0.2.1]" #:path ""))
+
(pass-if-uri-exception "http://foo:not-a-port"
"Expected.*port"
(build-uri 'http #:host "foo" #:port "not-a-port"))
#:scheme 'http #:host "[2001:db8::1]" #:path ""))
(pass-if "http://[2001:db8::1]:80"
- (uri=? (string->uri "http://[2001:db8::1]")
+ (uri=? (string->uri "http://[2001:db8::1]:80")
#:scheme 'http
#:host "[2001:db8::1]"
#:port 80
#:path ""))
+ (pass-if "http://[::ffff:192.0.2.1]"
+ (uri=? (string->uri "http://[::ffff:192.0.2.1]")
+ #:scheme 'http #:host "[::ffff:192.0.2.1]" #:path ""))
+
(pass-if "http://foo:"
(uri=? (string->uri "http://foo:")
#:scheme 'http #:host "foo" #:path ""))
(equal? "http://[2001:db8::1]"
(uri->string (string->uri "http://[2001:db8::1]"))))
- (pass-if "http://[2001:db8::1]:80"
- (equal? "http://[2001:db8::1]:80"
- (uri->string (string->uri "http://[2001:db8::1]:80"))))
+ (pass-if "http://[::ffff:192.0.2.1]"
+ (equal? "http://[::ffff:192.0.2.1]"
+ (uri->string (string->uri "http://[::ffff:192.0.2.1]"))))
(pass-if "http://foo:"
(equal? "http://foo"