romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 23:43:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

url: proxy: Use 443 as default port for https proxies

Browse source
This commit is contained in:
Thomas Glanzmann 2016-11-24 19:40:30 +01:00 • committed by Daniel Stenberg
parent 8ebc5cda8f
commit 1232dbb8bd
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/url.c
View file

@ -528,7 +528,7 @@ CURLcode Curl_init_userdefined(struct UserDefined *set)
/* Set the default size of the SSL session ID cache */
set->general_ssl.max_ssl_sessions = 5;
set->proxyport = CURL_DEFAULT_PROXY_PORT; /* from url.h */
set->proxyport = 0;
set->proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
set->httpauth = CURLAUTH_BASIC; /* defaults to basic */
set->proxyauth = CURLAUTH_BASIC; /* defaults to basic */
@ -4997,6 +4997,12 @@ static CURLcode parse_proxy(struct Curl_easy *data,
/* None given in the proxy string, then get the default one if it is
given */
port = data->set.proxyport;
else {
if(proxytype == CURLPROXY_HTTPS)
port = CURL_DEFAULT_HTTPS_PROXY_PORT;
else
port = CURL_DEFAULT_PROXY_PORT;
}
}
if(*proxyptr) {

2
lib/url.h
View file

@ -67,6 +67,8 @@ void Curl_getoff_all_pipelines(struct Curl_easy *data,
void Curl_close_connections(struct Curl_easy *data);
#define CURL_DEFAULT_PROXY_PORT 1080 /* default proxy port unless specified */
#define CURL_DEFAULT_HTTPS_PROXY_PORT 443 /* default https proxy port unless
specified */
CURLcode Curl_connected_proxy(struct connectdata *conn, int sockindex);