mirror of
https://github.com/curl/curl.git
synced 2026-08-25 06:03:32 +03:00
Karl M added the CURLOPT_CONNECT_ONLY and CURLINFO_LASTSOCKET options that
an app can use to let libcurl only connect to a remote host and then extract the socket from libcurl. libcurl will then not attempt to do any transfer at all after the connect is done.
This commit is contained in:
parent
b0bc2f00d2
commit
87bcb6f377
13 changed files with 119 additions and 48 deletions
|
|
@ -1689,7 +1689,7 @@ static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
|
|||
ftp_pasv_verbose(conn, conninfo, newhost, connectport);
|
||||
|
||||
#ifndef CURL_DISABLE_HTTP
|
||||
if(conn->bits.tunnel_proxy) {
|
||||
if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {
|
||||
/* FIX: this MUST wait for a proper connect first if 'connected' is
|
||||
* FALSE */
|
||||
|
||||
|
|
@ -2786,7 +2786,7 @@ CURLcode Curl_ftp_connect(struct connectdata *conn,
|
|||
ftp->response_time = 3600; /* set default response time-out */
|
||||
|
||||
#ifndef CURL_DISABLE_HTTP
|
||||
if (conn->bits.tunnel_proxy) {
|
||||
if (conn->bits.tunnel_proxy && conn->bits.httpproxy) {
|
||||
/* BLOCKING */
|
||||
/* We want "seamless" FTP operations through HTTP proxy tunnel */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue