vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

net.urllib: fix unescape

pull/1421/head
joe-conigliaro 2019-08-02 08:31:47 +10:00 committed by Alexander Medvednikov
parent 0e798b4c51
commit 8369525d8a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,7 +204,7 @@ fn unescape(s string, mode EncodingMode) ?string {
x := s[i] x := s[i]
switch x { switch x {
case `%`: case `%`:
t.write( (unhex(s[i+1])<<byte(4) | unhex(s[i+2])).str() ) t.write( byte(unhex(s[i+1])<<byte(4) | unhex(s[i+2])).str() )
i += 2 i += 2
case `+`: case `+`:
if mode == .EncodeQueryComponent { if mode == .EncodeQueryComponent {
@ -482,7 +482,7 @@ fn parse_request_url(rawurl string, via_request bool) ?URL {
mut rest := p[1] mut rest := p[1]
url.scheme = url.scheme.to_lower() url.scheme = url.scheme.to_lower()
// if rest.ends_with('?') && strings.Count(rest, '?') == 1 { // if rest.ends_with('?') && strings.count(rest, '?') == 1 {
if rest.ends_with('?') && !rest.trim_right('?').contains('?') { if rest.ends_with('?') && !rest.trim_right('?').contains('?') {
url.force_query = true url.force_query = true
rest = rest.left(rest.len-1) rest = rest.left(rest.len-1)