aboutsummaryrefslogtreecommitdiff
path: root/tests/libtest
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-11-04 23:30:48 +0100
committerDaniel Stenberg <daniel@haxx.se>2018-11-06 19:11:58 +0100
commit9df8dc101ba03807a3257ba0922fe4dd03c81ed3 (patch)
treed989d54168bbcd479768725e0555a1de79cf5a2d /tests/libtest
parent74f4782319d478953a29ed7de77d50901760ac3c (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/libtest')
-rw-r--r--tests/libtest/lib1560.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c
index 57469a906..5aa6f4bbc 100644
--- a/tests/libtest/lib1560.c
+++ b/tests/libtest/lib1560.c
@@ -128,6 +128,20 @@ struct querycase {
};
static struct testcase get_parts_list[] ={
+#ifdef WIN32
+ {"file:/C:\\programs\\foo",
+ "file | [11] | [12] | [13] | [14] | [15] | C:\\programs\\foo | [16] | [17]",
+ CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
+ {"file://C:\\programs\\foo",
+ "file | [11] | [12] | [13] | [14] | [15] | C:\\programs\\foo | [16] | [17]",
+ CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
+ {"file:///C:\\programs\\foo",
+ "file | [11] | [12] | [13] | [14] | [15] | C:\\programs\\foo | [16] | [17]",
+ CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
+#endif
+ {"boing:80",
+ "https | [11] | [12] | [13] | boing | 80 | / | [16] | [17]",
+ CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
{"http://[fd00:a41::50]:8080",
"http | [11] | [12] | [13] | [fd00:a41::50] | 8080 | / | [16] | [17]",
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},