3 files changed, 75 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 9b9529997..db22ab03e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Dan F (29 October 2007)
+- Added test case 546 to check that subsequent FTP transfers work after a
+  failed one using the multi interface
+
 Daniel S (29 October 2007)
 - Based on one of those bug reports that are intercepted by a distro's bug
   tracker (https://bugzilla.redhat.com/show_bug.cgi?id=316191), I now made
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index d48302223..ff296f2b9 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test231 test1000 test1001 test1002 test1003 test1004 test1005 test1006    \
  test615 test1007 test541 test1010 test1011 test1012 test542 test543       \
  test536 test1008 test1009 test2000 test2001 test2002 test2003 test35      \
- test544 test545 test2004
+ test544 test545 test2004 test546
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test546 b/tests/data/test546
new file mode 100644
index 000000000..1dd1cd41e
--- /dev/null
+++ b/tests/data/test546
@@ -0,0 +1,70 @@
+<testcase>
+<info>
+<keywords>
+FTP
+PASV
+RETR
+multi
+</keywords>
+</info>
+# Server-side
+<reply>
+<data nocheck="1">
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</data>
+
+<servercmd>
+REPLY RETR 550 the file doesn't exist
+COUNT RETR 1
+REPLY SIZE 550 Can't check for file existence
+COUNT SIZE 1
+</servercmd>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+<tool>
+lib533
+</tool>
+ <name>
+FTP RETR a non-existing file then a found one using the multi interface
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/path/546 ftp://%HOSTIP:%FTPPORT/path/546
+</command>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS ftp@example.com
+PWD
+CWD path
+EPSV
+TYPE I
+SIZE 546
+RETR 546
+EPSV
+SIZE 546
+RETR 546
+QUIT
+</protocol>
+<stdout>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+</stdout>
+</verify>
+</testcase>