Olivier reported that even though he used CURLOPT_PORT, libcurl clearly still

used the default port. He was right. I fixed the problem and added the test
cases 521, 522 and 523 to verify the fix.

3 files changed, 119 insertions, 1 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a1e455efa..0826e2894 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	\
  test199 test225 test226 test227 test230 test231 test232 test228	\
  test229 test233 test234 test235 test236 test520 test237 test238 \
  test239 test243 test245 test246 test247 test248 test249 test250 \
- test251 test252 test253 test254 test255
+ test251 test252 test253 test254 test255 test521 test522 test523
 
 # The following tests have been removed from the dist since they no longer
 # work. We need to fix the test suite's FTPS server first, then bring them
diff --git a/tests/data/test521 b/tests/data/test521
new file mode 100644
index 000000000..b3aad9646
--- /dev/null
+++ b/tests/data/test521
@@ -0,0 +1,59 @@
+<info>
+<keywords>
+FTP
+PASV
+CURLOPT_PORT
+</keywords>
+</info>
+#
+# Server-side
+<reply>
+<data>
+total 20

+drwxr-xr-x   8 98       98           512 Oct 22 13:06 .

+drwxr-xr-x   8 98       98           512 Oct 22 13:06 ..

+drwxr-xr-x   2 98       98           512 May  2  1996 .NeXT

+-r--r--r--   1 0        1             35 Jul 16  1996 README

+lrwxrwxrwx   1 0        1              7 Dec  9  1999 bin -> usr/bin

+dr-xr-xr-x   2 0        1            512 Oct  1  1997 dev

+drwxrwxrwx   2 98       98           512 May 29 16:04 download.html

+dr-xr-xr-x   2 0        1            512 Nov 30  1995 etc

+drwxrwxrwx   2 98       1            512 Oct 30 14:33 pub

+dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr

+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+ftp
+</server>
+<tool>
+lib521
+</tool>
+ <name>
+FTP dir list PASV with CURLOPT_PORT
+ </name>
+ <command>
+ftp://%HOSTIP/520/ %FTPPORT
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+filter off really nothing
+</strip>
+<protocol>
+USER xxx

+PASS yyy

+PWD

+CWD 520

+EPSV

+TYPE A

+LIST

+QUIT

+</protocol>
+</verify>
diff --git a/tests/data/test522 b/tests/data/test522
new file mode 100644
index 000000000..ceff5ecb8
--- /dev/null
+++ b/tests/data/test522
@@ -0,0 +1,59 @@
+<info>
+<keywords>
+HTTP
+HTTP GET
+CURLOPT_PORT
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data nocheck=1>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+
+hello
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+<tool>
+lib521
+</tool>
+ <name>
+HTTP GET with CURLOPT_PORT
+ </name>
+ <command>
+http://%HOSTIP/522 %HTTPPORT
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET /522 HTTP/1.1

+Authorization: Basic eHh4Onl5eQ==

+Host: 127.0.0.1:%HTTPPORT

+Pragma: no-cache

+Accept: */*

+

+</protocol>
+<stdout>
+hello
+</stdout>
+</verify>