aboutsummaryrefslogtreecommitdiff
path: root/tests/data/test596
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-12-05 11:42:10 +0100
committerDaniel Stenberg <daniel@haxx.se>2011-12-05 11:42:10 +0100
commit088ba97a2471c97e90fe7153dff0ce119faab4ef (patch)
tree20244866a27849b1b2126875f55d3c972aee6ea9 /tests/data/test596
parent9109cdec11ee5a19f132fd7bdf2e9ceefea4de41 (diff)
FTP: call opensocket callback properly
When the new socket is created for an active connection, it is now done using the open socket callback. Test case 596 was modified to run fine, although it hides the fact that the close callback is still called too many times, as it also gets called for closing sockets that were created with accept().
Diffstat (limited to 'tests/data/test596')
-rw-r--r--tests/data/test5968
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/data/test596 b/tests/data/test596
index 9703f0471..73e8a78d5 100644
--- a/tests/data/test596
+++ b/tests/data/test596
@@ -16,9 +16,10 @@ moo
<datacheck>
[OPEN] counter: 1
[OPEN] counter: 2
-moo
[CLOSE] counter: 2
+moo
[CLOSE] counter: 1
+[CLOSE] counter: 0
</datacheck>
</reply>
@@ -43,11 +44,14 @@ ftp://%HOSTIP:%FTPPORT/596 log/ip596 activeftp
#
# Verify data after the test has been "shot"
<verify>
+<strippart>
+s/^(EPRT \|1\|)(.*)/$1/
+</strippart>
<protocol>
USER anonymous
PASS ftp@example.com
PWD
-EPSV
+EPRT |1|
TYPE I
SIZE 596
RETR 596