ftp_state_pasv_resp: connect through proxy also when set by env
authorDaniel Stenberg <daniel@haxx.se>
Fri, 26 Apr 2013 14:45:31 +0000 (16:45 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Fri, 26 Apr 2013 14:49:25 +0000 (16:49 +0200)
commit0523152ad6e9d558c31bf176e8103038430badb3
tree5cce75be4e5516ddcc9d58810468434602aa5536
parentb37b5233cab96b5b1f2ab7f6e0b9c3df77320bba
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
lib/ftp.c
tests/data/Makefile.am
tests/data/test711 [new file with mode: 0644]
tests/data/test712 [new file with mode: 0644]