Gisle Vanem fixed the check-order for FTPS and FTP.

diff --git a/lib/url.c b/lib/url.c
index 69de6f8a0f1278e817109b1d4d6918d1dd1177c9..b703d18f85dd59f6659ce31cbc09a525ce82e758 100644 (file)
--- 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))