mirror of
https://github.com/moparisthebest/curl
synced 2024-12-24 09:08:49 -05:00
url: Remove unnecessary initialisation from allocate_conn()
No need to set variables to zero as calloc() does this for us. Closes #3879
This commit is contained in:
parent
6123d718aa
commit
b5d1de8e21
15
lib/url.c
15
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 */
|
||||
|
Loading…
Reference in New Issue
Block a user