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/data | |
| 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/data')
| -rw-r--r-- | tests/data/Makefile.inc | 2 | ||||
| -rw-r--r-- | tests/data/test203 | 6 | ||||
| -rw-r--r-- | tests/data/test2070 | 41 |
3 files changed, 6 insertions, 43 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 4611d3cb8..a4fe1deff 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -201,7 +201,7 @@ test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \ test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 \ test2056 test2057 test2058 test2059 test2060 test2061 test2062 test2063 \ test2064 test2065 test2066 test2067 test2068 test2069 \ -test2070 test2071 test2072 test2073 test2074 test2075 \ + test2071 test2072 test2073 test2074 test2075 \ test2080 \ test2100 \ \ diff --git a/tests/data/test203 b/tests/data/test203 index 393842656..ee850cb1c 100644 --- a/tests/data/test203 +++ b/tests/data/test203 @@ -24,8 +24,12 @@ file <name> file:/path URL with a single slash </name> +<setenv> +# Needed for MSYS2 to not convert +MSYS2_ARG_CONV_EXCL=file: +</setenv> <command option="no-include"> -file:%PWD/log/test203.txt +file:%FILE_PWD/log/test203.txt </command> <file name="log/test203.txt"> foo diff --git a/tests/data/test2070 b/tests/data/test2070 deleted file mode 100644 index 655cd8a39..000000000 --- a/tests/data/test2070 +++ /dev/null @@ -1,41 +0,0 @@ -<testcase> -<info> -<keywords> -FILE -</keywords> -</info> - -<reply> -<data> -foo - bar -bar - foo -moo -</data> -</reply> - -# Client-side -<client> -<server> -file -</server> - <name> -basic file:// file with no authority - </name> -<command option="no-include"> -file:%PWD/log/test2070.txt -</command> -<file name="log/test2070.txt"> -foo - bar -bar - foo -moo -</file> -</client> - -# Verify data after the test has been "shot" -<verify> -</verify> -</testcase> |