aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2003-12-02 06:25:41 +0000
committerDaniel Stenberg <daniel@haxx.se>2003-12-02 06:25:41 +0000
commitd1d417664ec5983265eabcab128628632d5a4a43 (patch)
treebe8fd52845ca1b79e664abba978ea1138c88b9e6
parent7d7e99104e38e168c5f9969d68651706846c04e8 (diff)
Gisle Vanem fixed the check-order for FTPS and FTP.
-rw-r--r--lib/url.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/url.c b/lib/url.c
index 69de6f8a0..b703d18f8 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2094,10 +2094,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
/* Note: if you add a new protocol, please update the list in
* lib/version.c too! */
- if(checkprefix("FTP", conn->gname)) {
- strcpy(conn->protostr, "ftp");
- }
- else if(checkprefix("GOPHER", conn->gname))
+ if(checkprefix("GOPHER", conn->gname))
strcpy(conn->protostr, "gopher");
#ifdef USE_SSLEAY
else if(checkprefix("HTTPS", conn->gname))
@@ -2105,6 +2102,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
else if(checkprefix("FTPS", conn->gname))
strcpy(conn->protostr, "ftps");
#endif /* USE_SSLEAY */
+ else if(checkprefix("FTP", conn->gname))
+ strcpy(conn->protostr, "ftp");
else if(checkprefix("TELNET", conn->gname))
strcpy(conn->protostr, "telnet");
else if (checkprefix("DICT", conn->gname))