Commit 817323ed authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

parse_proxy: switch off tunneling if non-HTTP proxy 

non-HTTP proxy implies not using CURLOPT_HTTPPROXYTUNNEL

Bug: http://curl.haxx.se/mail/lib-2015-05/0056.html
Reported-by: Sean Boudreau
parent 42ed88e7

lib/url.c

+3 −2
Changes for lib/url.c: 3 added lines, 2 removed lines.
Original line number Original line Diff line number Diff line
@@ -4518,7 +4518,6 @@ static char *detect_proxy(struct connectdata *conn) 
 * If this is supposed to use a proxy, we need to figure out the proxy

 * If this is supposed to use a proxy, we need to figure out the proxy

 * host name, so that we can re-use an existing connection

 * host name, so that we can re-use an existing connection

 * that may exist registered to the same proxy host.

 * that may exist registered to the same proxy host.

 * proxy will be freed before this function returns.

 */

 */

static CURLcode parse_proxy(struct SessionHandle *data,

static CURLcode parse_proxy(struct SessionHandle *data,

                            struct connectdata *conn, char *proxy)

                            struct connectdata *conn, char *proxy)
@@ -5566,8 +5565,10 @@ static CURLcode create_conn(struct SessionHandle *data, 
      conn->bits.httpproxy = TRUE;

      conn->bits.httpproxy = TRUE;

#endif

#endif

    }

    }

    else

    else {

      conn->bits.httpproxy = FALSE; /* not a HTTP proxy */

      conn->bits.httpproxy = FALSE; /* not a HTTP proxy */

      conn->bits.tunnel_proxy = FALSE; /* no tunneling if not HTTP */

    }

    conn->bits.proxy = TRUE;

    conn->bits.proxy = TRUE;

  }

  }

  else {

  else {