aboutsummaryrefslogtreecommitdiff
path: root/lib/url.c
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 /lib/url.c
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 'lib/url.c')
-rw-r--r--lib/url.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/url.c b/lib/url.c
index 121920c76..dd9fa2617 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2049,8 +2049,10 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
(data->set.disallow_username_in_url ?
CURLU_DISALLOW_USER : 0) |
(data->set.path_as_is ? CURLU_PATH_AS_IS : 0));
- if(uc)
+ if(uc) {
+ DEBUGF(infof(data, "curl_url_set rejected %s\n", data->change.url));
return Curl_uc_to_curlcode(uc);
+ }
uc = curl_url_get(uh, CURLUPART_SCHEME, &data->state.up.scheme, 0);
if(uc)