Commit d1d41766 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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

parent 7d7e9910
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -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))