Unverified Commit 9df8dc10 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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
parent 74f47823

lib/url.c

+3 −1
Original line number Diff line number Diff line
@@ -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)

lib/urlapi.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ bool Curl_is_absolute_url(const char *url, char *buf, size_t buflen) 
#endif

  for(i = 0; i < buflen && url[i]; ++i) {

    char s = url[i];

    if(s == ':') {

    if((s == ':') && (url[i + 1] == '/')) {

      if(buf)

        buf[i] = 0;

      return TRUE;

tests/FILEFORMAT

+2 −0
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@ Available substitute variables include: 
%POP3PORT  - Port number of the POP3 server

%PROXYPORT - Port number of the HTTP proxy

%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

%RTSPPORT  - Port number of the RTSP server

%SMTP6PORT - IPv6 port number of the SMTP server

tests/data/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -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 \

\

tests/data/test203

+5 −1
Original line number Diff line number Diff line
@@ -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