From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 2 Dec 2003 06:25:41 +0000 (+0000)
Subject: Gisle Vanem fixed the check-order for FTPS and FTP.
X-Git-Tag: curl-7_11_0~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1d417664ec5983265eabcab128628632d5a4a43;p=curl

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

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))