Added a new 'bit' in the connect struct named 'tunnel_proxy' that is set

if a connection is tunneled through a proxy. A tunnel is done with CONNECT,
either when using HTTPS or FTPS, or if explicitly enabled by the app.

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/url.c b/lib/url.c
index 188bf4c9e..65c99981e 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -2137,6 +2137,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
   conn->bits.user_passwd = data->set.userpwd?1:0;
   conn->bits.proxy_user_passwd = data->set.proxyuserpwd?1:0;
   conn->bits.no_body = data->set.opt_no_body;
+  conn->bits.tunnel_proxy = data->set.tunnel_thru_httpproxy;
 
   /* This initing continues below, see the comment "Continue connectdata
    * initialization here" */
@@ -2838,6 +2839,13 @@ static CURLcode CreateConnection(struct SessionHandle *data,
   }
 
   /*************************************************************
+   * If the protcol is using SSL and HTTP proxy is used, we set
+   * the tunnel_proxy bit.
+   *************************************************************/
+  if((conn->protocol&PROT_SSL) && conn->bits.httpproxy)
+    conn->bits.tunnel_proxy = TRUE;
+
+  /*************************************************************
    * Take care of user and password authentication stuff
    *************************************************************/