mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
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
This commit is contained in:
parent
74f4782319
commit
9df8dc101b
@ -2049,8 +2049,10 @@ static CURLcode parseurlandfillconn(struct Curl_easy *data,
|
|||||||
(data->set.disallow_username_in_url ?
|
(data->set.disallow_username_in_url ?
|
||||||
CURLU_DISALLOW_USER : 0) |
|
CURLU_DISALLOW_USER : 0) |
|
||||||
(data->set.path_as_is ? CURLU_PATH_AS_IS : 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);
|
return Curl_uc_to_curlcode(uc);
|
||||||
|
}
|
||||||
|
|
||||||
uc = curl_url_get(uh, CURLUPART_SCHEME, &data->state.up.scheme, 0);
|
uc = curl_url_get(uh, CURLUPART_SCHEME, &data->state.up.scheme, 0);
|
||||||
if(uc)
|
if(uc)
|
||||||
|
@ -238,7 +238,7 @@ bool Curl_is_absolute_url(const char *url, char *buf, size_t buflen)
|
|||||||
#endif
|
#endif
|
||||||
for(i = 0; i < buflen && url[i]; ++i) {
|
for(i = 0; i < buflen && url[i]; ++i) {
|
||||||
char s = url[i];
|
char s = url[i];
|
||||||
if(s == ':') {
|
if((s == ':') && (url[i + 1] == '/')) {
|
||||||
if(buf)
|
if(buf)
|
||||||
buf[i] = 0;
|
buf[i] = 0;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -365,6 +365,8 @@ Available substitute variables include:
|
|||||||
%POP3PORT - Port number of the POP3 server
|
%POP3PORT - Port number of the POP3 server
|
||||||
%PROXYPORT - Port number of the HTTP proxy
|
%PROXYPORT - Port number of the HTTP proxy
|
||||||
%PWD - Current directory
|
%PWD - Current directory
|
||||||
|
%POSIX_PWD - Current directory somewhat mingw friendly
|
||||||
|
%FILE_PWD - Current directory, on windows prefixed with a slash
|
||||||
%RTSP6PORT - IPv6 port number of the RTSP server
|
%RTSP6PORT - IPv6 port number of the RTSP server
|
||||||
%RTSPPORT - Port number of the RTSP server
|
%RTSPPORT - Port number of the RTSP server
|
||||||
%SMTP6PORT - IPv6 port number of the SMTP server
|
%SMTP6PORT - IPv6 port number of the SMTP server
|
||||||
|
@ -201,7 +201,7 @@ test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \
|
|||||||
test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 \
|
test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 \
|
||||||
test2056 test2057 test2058 test2059 test2060 test2061 test2062 test2063 \
|
test2056 test2057 test2058 test2059 test2060 test2061 test2062 test2063 \
|
||||||
test2064 test2065 test2066 test2067 test2068 test2069 \
|
test2064 test2065 test2066 test2067 test2068 test2069 \
|
||||||
test2070 test2071 test2072 test2073 test2074 test2075 \
|
test2071 test2072 test2073 test2074 test2075 \
|
||||||
test2080 \
|
test2080 \
|
||||||
test2100 \
|
test2100 \
|
||||||
\
|
\
|
||||||
|
@ -24,8 +24,12 @@ file
|
|||||||
<name>
|
<name>
|
||||||
file:/path URL with a single slash
|
file:/path URL with a single slash
|
||||||
</name>
|
</name>
|
||||||
|
<setenv>
|
||||||
|
# Needed for MSYS2 to not convert
|
||||||
|
MSYS2_ARG_CONV_EXCL=file:
|
||||||
|
</setenv>
|
||||||
<command option="no-include">
|
<command option="no-include">
|
||||||
file:%PWD/log/test203.txt
|
file:%FILE_PWD/log/test203.txt
|
||||||
</command>
|
</command>
|
||||||
<file name="log/test203.txt">
|
<file name="log/test203.txt">
|
||||||
foo
|
foo
|
||||||
|
@ -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>
|
|
@ -128,6 +128,20 @@ struct querycase {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static struct testcase get_parts_list[] ={
|
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://[fd00:a41::50]:8080",
|
||||||
"http | [11] | [12] | [13] | [fd00:a41::50] | 8080 | / | [16] | [17]",
|
"http | [11] | [12] | [13] | [fd00:a41::50] | 8080 | / | [16] | [17]",
|
||||||
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
CURLU_DEFAULT_SCHEME, 0, CURLUE_OK},
|
||||||
|
@ -3113,6 +3113,13 @@ sub subVariables {
|
|||||||
$$thing =~ s/%CURL/$CURL/g;
|
$$thing =~ s/%CURL/$CURL/g;
|
||||||
$$thing =~ s/%PWD/$pwd/g;
|
$$thing =~ s/%PWD/$pwd/g;
|
||||||
$$thing =~ s/%POSIX_PWD/$posix_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/%SRCDIR/$srcdir/g;
|
||||||
$$thing =~ s/%USER/$USER/g;
|
$$thing =~ s/%USER/$USER/g;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user