aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/url.c2
-rw-r--r--lib/url.h13
2 files changed, 3 insertions, 12 deletions
diff --git a/lib/url.c b/lib/url.c
index 92f7156d3..45d8c58c0 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -719,7 +719,7 @@ CURLcode Curl_open(struct SessionHandle **curl)
/* Set the default size of the SSL session ID cache */
data->set.ssl.numsessions = 5;
- data->set.proxyport = 1080;
+ data->set.proxyport = CURL_DEFAULT_PROXY_PORT; /* from url.h */
data->set.proxytype = CURLPROXY_HTTP; /* defaults to HTTP proxy */
data->set.httpauth = CURLAUTH_BASIC; /* defaults to basic */
data->set.proxyauth = CURLAUTH_BASIC; /* defaults to basic */
diff --git a/lib/url.h b/lib/url.h
index e38138f91..229f40866 100644
--- a/lib/url.h
+++ b/lib/url.h
@@ -72,20 +72,11 @@ int Curl_removeHandleFromPipeline(struct SessionHandle *handle,
void Curl_close_connections(struct SessionHandle *data);
-#if 0
-CURLcode Curl_protocol_fdset(struct connectdata *conn,
- fd_set *read_fd_set,
- fd_set *write_fd_set,
- int *max_fdp);
-CURLcode Curl_doing_fdset(struct connectdata *conn,
- fd_set *read_fd_set,
- fd_set *write_fd_set,
- int *max_fdp);
-#endif
-
/* Called on connect, and if there's already a protocol-specific struct
allocated for a different connection, this frees it that it can be setup
properly later on. */
void Curl_reset_reqproto(struct connectdata *conn);
+#define CURL_DEFAULT_PROXY_PORT 1080 /* default proxy port unless specified */
+
#endif