moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/libcurl/opts/CURLOPT_PROXYPORT.3
View File

@ -29,7 +29,8 @@ CURLOPT_PROXYPORT \- port number the proxy listens on
CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXYPORT, long port); CURLcode curl_easy_setopt(CURL *handle, CURLOPT_PROXYPORT, long port);
.SH DESCRIPTION .SH DESCRIPTION
Pass a long with this option to set the proxy port to connect to unless it is Pass a long with this option to set the proxy port to connect to unless it is
specified in the proxy string \fICURLOPT_PROXY(3)\fP or uses the default one. specified in the proxy string \fICURLOPT_PROXY(3)\fP or uses 443 for https
proxies and 1080 for all others as default.
While this accepts a 'long', the port number is 16 bit so it can't be larger While this accepts a 'long', the port number is 16 bit so it can't be larger
than 65535. than 65535.

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 the default size of the SSL session ID cache */
set->general_ssl.max_ssl_sessions = 5; 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->proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
set->httpauth = CURLAUTH_BASIC; /* defaults to basic */ set->httpauth = CURLAUTH_BASIC; /* defaults to basic */
set->proxyauth = 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 /* None given in the proxy string, then get the default one if it is
given */ given */
port = data->set.proxyport; port = data->set.proxyport;
else {
if(proxytype == CURLPROXY_HTTPS)
port = CURL_DEFAULT_HTTPS_PROXY_PORT;
else
port = CURL_DEFAULT_PROXY_PORT;
}
} }
if(*proxyptr) { 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); void Curl_close_connections(struct Curl_easy *data);
#define CURL_DEFAULT_PROXY_PORT 1080 /* default proxy port unless specified */ #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); CURLcode Curl_connected_proxy(struct connectdata *conn, int sockindex);