summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2019-05-08 12:12:49 +0100
committerSteve Holme <steve_holme@hotmail.com>2019-05-14 09:48:16 +0100
commitb5d1de8e217d705ecf3b7e5caa3bcf1346fef295 (patch)
treee969a4c352a2fa2bd7b78562a5fb61b6fb6a719f
parent6123d718aa9eead72144bde876d779b9d36bb6ad (diff)
downloadcurl-b5d1de8e217d705ecf3b7e5caa3bcf1346fef295.tar.gz
url: Remove unnecessary initialisation from allocate_conn()
No need to set variables to zero as calloc() does this for us. Closes #3879
-rw-r--r--lib/url.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/url.c b/lib/url.c
index 1daa1b4fd..f50562876 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1749,16 +1749,7 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
conn->http_proxy.proxytype = data->set.proxytype;
conn->socks_proxy.proxytype = CURLPROXY_SOCKS4;
-#ifdef CURL_DISABLE_PROXY
-
- conn->bits.proxy = FALSE;
- conn->bits.httpproxy = FALSE;
- conn->bits.socksproxy = FALSE;
- conn->bits.proxy_user_passwd = FALSE;
- conn->bits.tunnel_proxy = FALSE;
-
-#else /* CURL_DISABLE_PROXY */
-
+#if !defined(CURL_DISABLE_PROXY)
/* note that these two proxy bits are now just on what looks to be
requested, they may be altered down the road */
conn->bits.proxy = (data->set.str[STRING_PROXY] &&
@@ -1779,7 +1770,6 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
conn->bits.proxy_user_passwd =
(data->set.str[STRING_PROXYUSERNAME]) ? TRUE : FALSE;
conn->bits.tunnel_proxy = data->set.tunnel_thru_httpproxy;
-
#endif /* CURL_DISABLE_PROXY */
conn->bits.user_passwd = (data->set.str[STRING_USERNAME]) ? TRUE : FALSE;
@@ -1799,9 +1789,6 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
#if !defined(CURL_DISABLE_HTTP) && defined(USE_NTLM) && \
defined(NTLM_WB_ENABLED)
conn->ntlm_auth_hlpr_socket = CURL_SOCKET_BAD;
- conn->ntlm_auth_hlpr_pid = 0;
- conn->challenge_header = NULL;
- conn->response_header = NULL;
#endif
/* Initialize the easy handle list */