diff options
author | Daniel Stenberg <daniel@haxx.se> | 2013-04-26 16:45:31 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2013-04-26 16:49:25 +0200 |
commit | 0523152ad6e9d558c31bf176e8103038430badb3 (patch) | |
tree | 5cce75be4e5516ddcc9d58810468434602aa5536 /tests/data/test712 | |
parent | b37b5233cab96b5b1f2ab7f6e0b9c3df77320bba (diff) |
ftp_state_pasv_resp: connect through proxy also when set by env
When connecting back to an FTP server after having sent PASV/EPSV,
libcurl sometimes didn't use the proxy properly even though the proxy
was used for the initial connect.
The function wrongly checked for the CURLOPT_PROXY variable to be set,
which made it act wrongly if the proxy information was set with an
environment variable.
Added test case 711 to verify (based on 707 which uses --socks5). Also
added test712 to verify another variation of setting the proxy: with
--proxy socks5://
Bug: http://curl.haxx.se/bug/view.cgi?id=1218
Reported-by: Zekun Ni
Diffstat (limited to 'tests/data/test712')
-rw-r--r-- | tests/data/test712 | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/tests/data/test712 b/tests/data/test712 new file mode 100644 index 000000000..c62e9f2c5 --- /dev/null +++ b/tests/data/test712 @@ -0,0 +1,49 @@ +<testcase> +#based off test 707 after bug report #1218 +<info> +<keywords> +FTP +PASV +RETR +SOCKS5 +all_proxy +</keywords> +</info> +# +# Server-side +<reply> +<data> +silly content +</data> +</reply> + +# +# Client-side +<client> +<server> +ftp +socks5 +</server> + <name> +FTP fetch with --proxy set to socks5:// + </name> + <command> +ftp://%HOSTIP:%FTPPORT/712 --proxy socks5://%HOSTIP:%SOCKSPORT +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE 712
+RETR 712
+QUIT
+</protocol> +</verify> +</testcase> |