If only a partial file was transfered, we consider that a fatal problem so

we won't try to QUIT the control connection and risk "hanging" waiting for
a response. Test case 161 verifies this. The quit-sending function was
also made static.

3 files changed, 45 insertions, 1 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 5012165e3..39c807a39 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -22,7 +22,7 @@ test80 test81 test82 test83 test84 test85 test86 test87 test507		\
 test149 test88 test89 test90 test508 test91 test92 test203 test93	\
 test94 test95 test509 test510 test97 test98 test99 test150 test151	\
 test152 test153 test154 test155 test156 test157 test158 test159 test511 \
-test160
+test160 test161
 
 # 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/test161 b/tests/data/test161
new file mode 100644
index 000000000..c3bda556f
--- /dev/null
+++ b/tests/data/test161
@@ -0,0 +1,39 @@
+# Server-side
+<reply>
+<data>
+1oooooooooooooooooooooooooooooooooooooooooo2
+</data>
+<size>
+10928
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP RETR PASV
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/161
+</command>
+</test>
+
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous

+PASS curl_by_daniel@haxx.se

+PWD

+EPSV

+TYPE I

+SIZE 161

+RETR 161

+</protocol>
+<errorcode>
+18
+</errrorcode>
+</verify>
diff --git a/tests/memanalyze.pl b/tests/memanalyze.pl
index b15e43d78..eaa8b5fe9 100755
--- a/tests/memanalyze.pl
+++ b/tests/memanalyze.pl
@@ -258,6 +258,11 @@ while(<FILE>) {
             }
         }
     }
+    # GETNAME url.c:1901 getnameinfo()
+    elsif($_ =~ /^GETNAME ([^ ]*):(\d*) (.*)/) {
+        # not much to do
+    }
+
     # ADDR url.c:1282 getaddrinfo() = 0x5ddd
     elsif($_ =~ /^ADDR ([^ ]*):(\d*) (.*)/) {
         # generic match for the filename+linenumber