modified to work with modified code

diff --git a/tests/data/test103 b/tests/data/test103
index 224e32a9ed0cbb286507720042da07e78828d089..d362feaee7383f9896307d3355ee7a20d66a9589 100644 (file)
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -31,7 +31,8 @@ ftp://%HOSTIP:%FTPPORT/a/path/103 -P -
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD a/path\r
+CWD a\r
+CWD path\r
 PORT 127,0,0,1,246,33\r
 TYPE I\r
 SIZE 103\r

diff --git a/tests/data/test104 b/tests/data/test104
index b4cf3e145ea632a58a93c55f345116c031d51bfb..ef6b9fc5dbcd89bcfe24a28117c04974a959e70f 100644 (file)
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -21,7 +21,8 @@ ftp://%HOSTIP:%FTPPORT/a/path/103 --head
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD a/path\r
+CWD a\r
+CWD path\r
 MDTM 103\r
 TYPE I\r
 SIZE 103\r

diff --git a/tests/data/test106 b/tests/data/test106
index fdf6cb019be6c16927129db895345ab826d8a4a8..4f8a3b3171608e5e7087624db95a04f134dbe74b 100644 (file)
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -26,7 +26,9 @@ FTP GET with type=A style ASCII URL using %20 codes
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD /path with  spaces/and things2\r
+CWD \r
+CWD path with  spaces\r
+CWD and things2\r
 EPSV\r
 TYPE A\r
 SIZE 106\r

diff --git a/tests/data/test108 b/tests/data/test108
index 3f61acd002df1459e2bb45254bf8388d46ab259b..eadc076f527397b68b49f866b8af8da82f6203de 100644 (file)
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -29,7 +29,9 @@ Moooooooooooo
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD CWD/STOR/RETR\r
+CWD CWD\r
+CWD STOR\r
+CWD RETR\r
 PORT 127,0,0,1,5,109\r
 TYPE I\r
 STOR 108\r

diff --git a/tests/data/test125 b/tests/data/test125
index 7581d6e8e50f845e52903261d1098c009f175722..6fa05add55aeacad3b2f7803043b3d1cfeb0d01d 100644 (file)
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -24,6 +24,6 @@ REPLY CWD 314 bluah you f00l!
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD path/to/file\r
+CWD path\r
 </protocol>
 </verify>

diff --git a/tests/data/test126 b/tests/data/test126
index 55abb5af662d54caf9c5ecb4752744da06124346..060eefc507270231e16c379c4c0a65cd38960fbc 100644 (file)
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -24,7 +24,8 @@ RETRWEIRDO
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD blalbla/lululul\r
+CWD blalbla\r
+CWD lululul\r
 EPSV\r
 TYPE I\r
 SIZE 126\r

diff --git a/tests/data/test127 b/tests/data/test127
index 890af2f6f4530f6eed0bc3b35f1e7e3461d3e51b..34618308d082ec240bfdec63b35e7f9ff948c26a 100644 (file)
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -21,7 +21,9 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/127 --disable-epsv
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD path/to/file\r
+CWD path\r
+CWD to\r
+CWD file\r
 PASV\r
 TYPE I\r
 SIZE 127\r

diff --git a/tests/data/test137 b/tests/data/test137
index aa6a846b99036e12abc911421ec302b4edccbc53..3138f177365c91dddb6c0242543f9903dbfd9d65 100644 (file)
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -24,7 +24,8 @@ RETRNOSIZE
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD blalbla/lululul\r
+CWD blalbla\r
+CWD lululul\r
 EPSV\r
 TYPE I\r
 SIZE 137\r

diff --git a/tests/data/test138 b/tests/data/test138
index d3479e661bd1af4f3f12617712e48c5dc46f8a1a..0d8bb90abde0399efabfd1689edcd0684b90b6cb 100644 (file)
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -27,7 +27,8 @@ RETRNOSIZE
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD blalbla/lululul\r
+CWD blalbla\r
+CWD lululul\r
 EPSV\r
 TYPE I\r
 SIZE 138\r

diff --git a/tests/data/test190 b/tests/data/test190
index 8b83521f893036ab291110d96f6d42e77385613a..947fda9ad5beabb506e9f47998ca1eee495c9dbd 100644 (file)
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -25,6 +25,6 @@ DELAY CWD 15
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD path/to/file\r
+CWD path\r
 </protocol>
 </verify>

diff --git a/tests/data/test31 b/tests/data/test31
index 88a49751ead604b3b5fe007ed8ea9a460a60e638..8ff61a0dfacae2fea6685b1e1e398b3d47f31036 100644 (file)
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -6,14 +6,16 @@ Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake\r
 Content-Type: text/html\r
 Funny-head: yesyes\r
-Set-Cookie: foobar=name; domain=127.0.0.1; path=/ ; secure\r
+Set-Cookie: foobar=name; domain=anything.com; path=/ ; secure\r
 Set-Cookie:ismatch=this  ; domain=127.0.0.1; path=/silly/\r
 Set-Cookie: partmatch=present; domain=127.0.0.1 ; path=/;\r
 Set-Cookie:eat=this; domain=moo.foo.moo;\r
 Set-Cookie: eat=this-too; domain=.foo.moo;\r
 Set-Cookie: nodomainnovalue\r
 Set-Cookie:   nodomain=value; expires=Tue Feb 1 11:56:27 MET 2014\r
-Set-Cookie: nodomainnovalue; domain=reallysilly\r
+Set-Cookie: novalue; domain=reallysilly\r
+Set-Cookie: test=yes; domain=foo.com; expires=Tue Feb 1 11:56:27 MET 2007\r
+Set-Cookie: test2=yes; domain=se; expires=Tue Feb 1 11:56:27 MET 2007\r
 \r
 boo
 </data>
@@ -46,11 +48,8 @@ Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
 # http://www.netscape.com/newsref/std/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
-127.0.0.1      FALSE   /       TRUE    0       foobar  name
-127.0.0.1      FALSE   /silly/ FALSE   0       ismatch this
-127.0.0.1      FALSE   /       FALSE   0       partmatch       present
-moo.foo.moo    FALSE   /       FALSE   0       eat     this
-.foo.moo       TRUE    /       FALSE   0       eat     this-too
-127.0.0.1      FALSE   /       FALSE   1391252187      nodomain        value
+.127.0.0.1     TRUE    /silly/ FALSE   0       ismatch this
+.127.0.0.1     TRUE    /       FALSE   0       partmatch       present
+127.0.0.1      FALSE   /we/want/       FALSE   1391252187      nodomain        value
 </file>
 </verify>

diff --git a/tests/data/test401 b/tests/data/test401
index c23420ddf3c77cd7e08e24eef8a75c455eb6a783..a733eb2b31be6dc24804f685adb04e52a0cbebcc 100644 (file)
--- a/tests/data/test401
+++ b/tests/data/test401
@@ -25,6 +25,6 @@ DELAY CWD 15
 USER anonymous\r
 PASS curl_by_daniel@haxx.se\r
 PWD\r
-CWD path/to/file\r
+CWD path\r
 </protocol>
 </verify>