1 files changed, 29 insertions, 12 deletions
diff --git a/tests/data/test554 b/tests/data/test554
index 134f7ef..b55fa3d 100644
--- a/tests/data/test554
+++ b/tests/data/test554
@@ -1,14 +1,21 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP POST
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
-<data mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake swsclose
-Connection: close
-Content-Type: text/html
-
+<data>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Connection: close
+Content-Type: text/html
+
 hello
 </data>
 </reply>
@@ -35,17 +42,17 @@ http://%HOSTIP:%HTTPPORT/554
 # Verify data after the test has been "shot"
 <verify>
 <strippart>
-s/^------------------------------[a-z0-9]*/------------------------------/
-s/boundary=----------------------------[a-z0-9]*/boundary=----------------------------/
+s/^--------------------------[a-z0-9]*/------------------------------/
+s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 # Note that the stripping above removes 12 bytes from every occurance of the
-# boundary string and since 4 of them are in the body contents, we see
-# 415 - (4*12) here == 367 bytes.
+# boundary string and since 5 of them are in the body contents, we see
+# (5*12) == 60 bytes less
 <protocol>
 POST /554 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Accept: */*
-Content-Length: 415
+Content-Length: 718
 Expect: 100-continue
 Content-Type: multipart/form-data; boundary=----------------------------
 
@@ -55,6 +62,11 @@ Content-Disposition: form-data; name="sendfile"; filename="postit2.c"
 this is what we post to the silly web server
 
 ------------------------------
+Content-Disposition: form-data; name="callbackdata"
+
+this is what we post to the silly web server
+
+------------------------------
 Content-Disposition: form-data; name="filename"
 
 postit2.c
@@ -62,6 +74,11 @@ postit2.c
 Content-Disposition: form-data; name="submit"
 
 send
+------------------------------
+Content-Disposition: form-data; name="somename"; filename="somefile.txt"
+Content-Type: text/plain
+
+blah blah
 --------------------------------
 </protocol>
 </verify>