mirror of
https://github.com/moparisthebest/curl
synced 2024-12-22 08:08:50 -05:00
moved variables more locally to get rid of one set of #ifdefs
This commit is contained in:
parent
51d1f309cd
commit
bcdbba05d3
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user