moved variables more locally to get rid of one set of #ifdefs (bcdbba05) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/ftp.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -3040,11 +3040,6 @@ static CURLcode ftp_connect(struct connectdata *conn,
		bool done) / see description above */
		{
		CURLcode result;
		#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
		/* for FTP over HTTP proxy */
		struct HTTP http_proxy;
		struct FTP *ftp_save;
		#endif /* CURL_DISABLE_HTTP */
		struct ftp_conn *ftpc = &conn->proto.ftpc;
		struct SessionHandle *data=conn->data;

		@@ -3065,6 +3060,10 @@ static CURLcode ftp_connect(struct connectdata *conn,

		#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_PROXY)
		if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
		/* for FTP over HTTP proxy */
		struct HTTP http_proxy;
		struct FTP *ftp_save;

		/* BLOCKING */
		/* We want "seamless" FTP operations through HTTP proxy tunnel */