Gisle Vanem fixed the check-order for FTPS and FTP.
This commit is contained in:
Родитель
7d7e99104e
Коммит
d1d417664e
|
@ -2094,10 +2094,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
|
||||||
/* Note: if you add a new protocol, please update the list in
|
/* Note: if you add a new protocol, please update the list in
|
||||||
* lib/version.c too! */
|
* lib/version.c too! */
|
||||||
|
|
||||||
if(checkprefix("FTP", conn->gname)) {
|
if(checkprefix("GOPHER", conn->gname))
|
||||||
strcpy(conn->protostr, "ftp");
|
|
||||||
}
|
|
||||||
else if(checkprefix("GOPHER", conn->gname))
|
|
||||||
strcpy(conn->protostr, "gopher");
|
strcpy(conn->protostr, "gopher");
|
||||||
#ifdef USE_SSLEAY
|
#ifdef USE_SSLEAY
|
||||||
else if(checkprefix("HTTPS", conn->gname))
|
else if(checkprefix("HTTPS", conn->gname))
|
||||||
|
@ -2105,6 +2102,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
|
||||||
else if(checkprefix("FTPS", conn->gname))
|
else if(checkprefix("FTPS", conn->gname))
|
||||||
strcpy(conn->protostr, "ftps");
|
strcpy(conn->protostr, "ftps");
|
||||||
#endif /* USE_SSLEAY */
|
#endif /* USE_SSLEAY */
|
||||||
|
else if(checkprefix("FTP", conn->gname))
|
||||||
|
strcpy(conn->protostr, "ftp");
|
||||||
else if(checkprefix("TELNET", conn->gname))
|
else if(checkprefix("TELNET", conn->gname))
|
||||||
strcpy(conn->protostr, "telnet");
|
strcpy(conn->protostr, "telnet");
|
||||||
else if (checkprefix("DICT", conn->gname))
|
else if (checkprefix("DICT", conn->gname))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче