aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2008-07-11 05:08:06 +0000
committerDan Fandrich <dan@coneharvesters.com>2008-07-11 05:08:06 +0000
commit8d49a8f2787676bfe8621f1e0cdb9f42ac23c809 (patch)
treef862b6ae7363f6fabbfecb70b86d695a5a80fde4
parentb4b6cfdb1cdbac5fe0db690d4a3248f94dcb8446 (diff)
Added test cases 1038 and 1039 to test Adrian Kreher's report that ftp
uploads with -C - didn't resume properly, but the tests pass.
-rw-r--r--CHANGES3
-rw-r--r--tests/data/Makefile.am2
-rw-r--r--tests/data/test103853
-rw-r--r--tests/data/test103953
4 files changed, 110 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index ef250ba33..bfa1942fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,9 @@ Daniel Fandrich (10 Jul 2008)
reported when setting some modes, but regardless, it saves a protocol
round trip in the chmod case.
+- Added test cases 1038 and 1039 to test Adrian Kreher's report that ftp
+ uploads with -C - didn't resume properly, but the tests pass.
+
Yang Tse (10 Jul 2008)
- Peter Lamberg filed bug report #2015126: "poll gives WSAEINVAL when POLLPRI
is set in fdset.events" (http://curl.haxx.se/bug/view.cgi?id=2015126) which
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index d8375a462..b11da41df 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -52,7 +52,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \
test620 test621 test622 test623 test624 test625 test626 test627 test554 \
test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030 \
test556 test1031 test628 test629 test630 test631 test632 test1032 test1033 \
- test539 test1034 test1035 test1036 test1037
+ test539 test1034 test1035 test1036 test1037 test1038 test1039
filecheck:
@mkdir test-place; \
diff --git a/tests/data/test1038 b/tests/data/test1038
new file mode 100644
index 000000000..9572d78e0
--- /dev/null
+++ b/tests/data/test1038
@@ -0,0 +1,53 @@
+<testcase>
+<info>
+<keywords>
+FTP
+EPSV
+APPE
+Resume
+</keywords>
+</info>
+# Server-side
+<reply>
+<size>
+17
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP PASV upload resume from end of file
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/1038 -T log/upload1038 -C -
+</command>
+<file name="log/upload1038">
+this is the *****cr@p******** that we're gonna upload
+
+worx?
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE 1038
+APPE 1038
+QUIT
+</protocol>
+<upload>
+cr@p******** that we're gonna upload
+
+worx?
+</upload>
+</verify>
+</testcase>
diff --git a/tests/data/test1039 b/tests/data/test1039
new file mode 100644
index 000000000..654d836d2
--- /dev/null
+++ b/tests/data/test1039
@@ -0,0 +1,53 @@
+<testcase>
+<info>
+<keywords>
+FTP
+EPSV
+APPE
+Resume
+</keywords>
+</info>
+# Server-side
+<reply>
+<size>
+0
+</size>
+</reply>
+
+# Client-side
+<client>
+<server>
+ftp
+</server>
+ <name>
+FTP PASV upload resume from end of empty file
+ </name>
+ <command>
+ftp://%HOSTIP:%FTPPORT/1039 -T log/upload1039 -C -
+</command>
+<file name="log/upload1039">
+this is the *****cr@p******** that we're gonna upload
+
+worx?
+</file>
+</client>
+
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+USER anonymous
+PASS ftp@example.com
+PWD
+EPSV
+TYPE I
+SIZE 1039
+STOR 1039
+QUIT
+</protocol>
+<upload>
+this is the *****cr@p******** that we're gonna upload
+
+worx?
+</upload>
+</verify>
+</testcase>