diff options
author | Daniel Stenberg <daniel@haxx.se> | 2002-10-10 08:00:49 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2002-10-10 08:00:49 +0000 |
commit | 701509d32237da51bd5b4e6c5bcbd145541259a1 (patch) | |
tree | eb828ce00c1c01e407f784898658ac0dadfac8dc /lib/url.c | |
parent | c3cc616264e6a424306edb7ff2acd035b31c90ef (diff) |
Jeff Lawson fixed a few problems with connection re-use that remained when
you set CURLOPT_PROXY to "".
Diffstat (limited to 'lib/url.c')
-rw-r--r-- | lib/url.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1729,9 +1729,11 @@ static CURLcode CreateConnection(struct SessionHandle *data, conn->firstsocket = -1; /* no file descriptor */ conn->secondarysocket = -1; /* no file descriptor */ conn->connectindex = -1; /* no index */ - conn->bits.httpproxy = data->change.proxy?TRUE:FALSE; /* proxy-or-not */ + conn->bits.httpproxy = (data->change.proxy && *data->change.proxy && + (data->set.proxytype == CURLPROXY_HTTP))? + TRUE:FALSE; /* http proxy or not */ conn->bits.use_range = data->set.set_range?TRUE:FALSE; /* range status */ - conn->range = data->set.set_range; /* clone the range setting */ + conn->range = data->set.set_range; /* clone the range setting */ conn->resume_from = data->set.set_resume_from; /* inherite resume_from */ /* Default protocol-independent behavior doesn't support persistant |