TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-17 03:17:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

net.urllib: update parse host to allow for better error handling (#21602)

Browse Source
This commit is contained in:
Turiiya 2024-05-30 16:38:15 +02:00 committed by GitHub
parent 5f83a4d110
commit 4bda28b718
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vlib/net/urllib/urllib.v
View File

@ -564,7 +564,7 @@ fn parse_host(host string) !string {
if host.len > 0 && host[0] == `[` { if host.len > 0 && host[0] == `[` {
// parse an IP-Literal in RFC 3986 and RFC 6874. // parse an IP-Literal in RFC 3986 and RFC 6874.
// E.g., '[fe80::1]', '[fe80::1%25en0]', '[fe80::1]:80'. // E.g., '[fe80::1]', '[fe80::1%25en0]', '[fe80::1]:80'.
mut i := host.index_u8_last(`]`) i := host.index_u8_last(`]`)
if i == -1 { if i == -1 {
return error(error_msg("parse_host: missing ']' in host", '')) return error(error_msg("parse_host: missing ']' in host", ''))
} }
@ -580,9 +580,9 @@ fn parse_host(host string) !string {
// We do impose some restrictions on the zone, to avoid stupidity // We do impose some restrictions on the zone, to avoid stupidity
// like newlines. // like newlines.
if zone := host[..i].index('%25') { if zone := host[..i].index('%25') {
host1 := unescape(host[..zone], .encode_host) or { return err.msg() } host1 := unescape(host[..zone], .encode_host)!
host2 := unescape(host[zone..i], .encode_zone) or { return err.msg() } host2 := unescape(host[zone..i], .encode_zone)!
host3 := unescape(host[i..], .encode_host) or { return err.msg() } host3 := unescape(host[i..], .encode_host)!
return host1 + host2 + host3 return host1 + host2 + host3
} }
} else { } else {
@ -595,10 +595,8 @@ fn parse_host(host string) !string {
} }
} }
} }
h := unescape(host, .encode_host) or { return err.msg() } h := unescape(host, .encode_host)!
return h return h
// host = h
// return host
} }
// set_path sets the path and raw_path fields of the URL based on the provided // set_path sets the path and raw_path fields of the URL based on the provided