diff options
author | Daniel Stenberg <daniel@haxx.se> | 2018-11-04 23:30:48 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2018-11-06 19:11:58 +0100 |
commit | 9df8dc101ba03807a3257ba0922fe4dd03c81ed3 (patch) | |
tree | d989d54168bbcd479768725e0555a1de79cf5a2d /tests/runtests.pl | |
parent | 74f4782319d478953a29ed7de77d50901760ac3c (diff) |
url: a short host name + port is not a scheme
The function identifying a leading "scheme" part of the URL considered a
few letters ending with a colon to be a scheme, making something like
"short:80" to become an unknown scheme instead of a short host name and
a port number.
Extended test 1560 to verify.
Also fixed test203 to use file_pwd to make it get the correct path on
windows. Removed test 2070 since it was a duplicate of 203.
Assisted-by: Marcel Raad
Reported-by: Hagai Auro
Fixes #3220
Fixes #3233
Closes #3223
Closes #3235
Diffstat (limited to 'tests/runtests.pl')
-rwxr-xr-x | tests/runtests.pl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index 421cf2a6b..5b51d3e4f 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -3113,6 +3113,13 @@ sub subVariables { $$thing =~ s/%CURL/$CURL/g; $$thing =~ s/%PWD/$pwd/g; $$thing =~ s/%POSIX_PWD/$posix_pwd/g; + + my $file_pwd = $pwd; + if($file_pwd !~ /^\//) { + $file_pwd = "/$file_pwd"; + } + + $$thing =~ s/%FILE_PWD/$file_pwd/g; $$thing =~ s/%SRCDIR/$srcdir/g; $$thing =~ s/%USER/$USER/g; |