projects
/
platform
/
upstream
/
curl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7138296
)
more SOCKS5_HOSTNAME adjustments from Richard Atterer
author
Daniel Stenberg
<daniel@haxx.se>
Sun, 6 Jan 2008 21:41:38 +0000
(21:41 +0000)
committer
Daniel Stenberg
<daniel@haxx.se>
Sun, 6 Jan 2008 21:41:38 +0000
(21:41 +0000)
lib/ftp.c
patch
|
blob
|
history
lib/url.c
patch
|
blob
|
history
diff --git
a/lib/ftp.c
b/lib/ftp.c
index
9507c6f
..
29cbcb0
100644
(file)
--- a/
lib/ftp.c
+++ b/
lib/ftp.c
@@
-1882,6
+1882,7
@@
static CURLcode ftp_state_pasv_resp(struct connectdata *conn,
switch(data->set.proxytype) {
case CURLPROXY_SOCKS5:
+ case CURLPROXY_SOCKS5_HOSTNAME:
result = Curl_SOCKS5(conn->proxyuser, conn->proxypasswd, newhost, newport,
SECONDARYSOCKET, conn);
break;
diff --git
a/lib/url.c
b/lib/url.c
index
8e24053
..
25d40b9
100644
(file)
--- a/
lib/url.c
+++ b/
lib/url.c
@@
-1868,7
+1868,7
@@
CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
case CURLOPT_PROXYTYPE:
/*
- * Set proxy type. HTTP/SOCKS4/SOCKS4a/SOCKS5
+ * Set proxy type. HTTP/SOCKS4/SOCKS4a/SOCKS5
/SOCKS5_HOSTNAME
*/
data->set.proxytype = (curl_proxytype)va_arg(param, long);
break;