4 files changed, 154 insertions, 1 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 4f8b3d670..7fe4a1818 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -31,7 +31,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	\
  test517 test518 test210 test211 test212 test220 test221 test222	\
  test223 test224 test206 test207 test208 test209 test213 test240	\
  test241 test242 test519 test214 test215 test216 test217 test218	\
- test199 test225 test226 test227
+ test199 test225 test226 test227 test230 test231 test232
 
 # 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/test230 b/tests/data/test230
new file mode 100644
index 000000000..8ae9edfa4
--- /dev/null
+++ b/tests/data/test230
@@ -0,0 +1,51 @@
+#
+# Server-side
+<reply>
+<data nocheck=1>
+contents of source file 230
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+ftp
+ftp2
+</server>
+ <name>
+FTP 3rd party transfer
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/dest/destpath/230 -u daniel:stenberg --3p-url ftp://%HOSTIP:%FTP2PORT/source/sourcepath/230 --3p-user daniel2:stenberg2
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+# target-side protocol check
+<protocol>
+USER daniel
+PASS stenberg
+PWD
+TYPE I
+CWD dest
+CWD destpath
+PASV
+STOR 230
+QUIT
+</protocol>
+<stripfile>
+s/^(PORT 127,0,0,1).*/$1/
+</stripfile>
+<file name="log/server2.input">
+USER daniel2
+PASS stenberg2
+PWD
+TYPE I
+PORT 127,0,0,1
+RETR source/sourcepath/230
+QUIT
+</file>
+</verify>
diff --git a/tests/data/test231 b/tests/data/test231
new file mode 100644
index 000000000..10ab24c48
--- /dev/null
+++ b/tests/data/test231
@@ -0,0 +1,51 @@
+#
+# Server-side
+<reply>
+<data nocheck=1>
+contents of source file 231
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+ftp
+ftp2
+</server>
+ <name>
+FTP 3rd party transfer, make target use PORT
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/dest/destpath/231 -u daniel:stenberg --3p-url ftp://%HOSTIP:%FTP2PORT/source/sourcepath/231 --3p-user daniel2:stenberg2 -P -
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+# target-side protocol check
+<strippart>>
+s/^(PORT 127,0,0,1).*/$1/
+</strippart>
+<protocol>
+USER daniel
+PASS stenberg
+PWD
+TYPE I
+CWD dest
+CWD destpath
+PORT 127,0,0,1
+STOR 231
+QUIT
+</protocol>
+<file name="log/server2.input">
+USER daniel2
+PASS stenberg2
+PWD
+TYPE I
+PASV
+RETR source/sourcepath/231
+QUIT
+</file>
+</verify>
diff --git a/tests/data/test232 b/tests/data/test232
new file mode 100644
index 000000000..2c584efd3
--- /dev/null
+++ b/tests/data/test232
@@ -0,0 +1,51 @@
+#
+# Server-side
+<reply>
+<data nocheck=1>
+contents of source file 232
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+ftp
+ftp2
+</server>
+ <name>
+FTP 3rd party transfer, anonymous user
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/dest/destpath/232 --3p-url ftp://%HOSTIP:%FTP2PORT/source/sourcepath/232
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+# target-side protocol check
+<protocol>
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+TYPE I
+CWD dest
+CWD destpath
+PASV
+STOR 232
+QUIT
+</protocol>
+<stripfile>
+s/^(PORT 127,0,0,1).*/$1/
+</stripfile>
+<file name="log/server2.input">
+USER anonymous
+PASS curl_by_daniel@haxx.se
+PWD
+TYPE I
+PORT 127,0,0,1
+RETR source/sourcepath/232
+QUIT
+</file>
+</verify>