adjusted the formpost testcases to the new boundary string construction

tests/data/test304

@@ -27,32 +27,32 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|--curl).*
+^(User-Agent:|Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
 POST /we/want/304 HTTP/1.1
-User-Agent: curl/7.9.5-pre4 (sparc-sun-solaris2.7) libcurl 7.9.5-pre4 (OpenSSL 0.9.6c) (krb4 enabled)
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8433
 Pragma: no-cache
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 1354
+Content-Length: 1390
 Expect: 100-continue
-Content-Type: multipart/form-data; boundary=curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ
+Content-Type: multipart/form-data; boundary=----------------------------c3b2ef7f0bb8
 
---curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ
+------------------------------c3b2ef7f0bb8
 Content-Disposition: form-data; name="name"
 
 daniel
---curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ
+------------------------------c3b2ef7f0bb8
 Content-Disposition: form-data; name="tool"
 
 curl
---curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ
+------------------------------c3b2ef7f0bb8
 Content-Disposition: form-data; name="file"; filename="log/test304.txt"
 Content-Type: text/plain
 
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 
---curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ--
+------------------------------c3b2ef7f0bb8--
 </protocol>
 </verify>

tests/data/test39

@@ -30,27 +30,27 @@ foo
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|--curl).*
+^(User-Agent:|Content-Type: multipart/form-data;|-------).*
 </strip>
 <protocol>
 POST /we/want/39 HTTP/1.1
-User-Agent: curl/7.9.5 (sparc-sun-solaris2.7) libcurl 7.9.5 (OpenSSL 0.9.6c) (krb4 enabled)
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 553
+Content-Length: 598
 Expect: 100-continue
-Content-Type: multipart/form-data; boundary=curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32
 
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+------------------------------24e78000bd32
 Content-Disposition: form-data; name="name"
 
 daniel
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+------------------------------24e78000bd32
 Content-Disposition: form-data; name="tool"
 
 curl
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+------------------------------24e78000bd32
 Content-Disposition: form-data; name="file"; filename="fakerfile"
 Content-Type: moo/foobar
 
@@ -59,7 +59,7 @@ This is a bar foo
 bar
 foo
 
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/
+------------------------------24e78000bd32
 Content-Disposition: form-data; name="file2"; filename="log/test39.txt"
 Content-Type: text/plain
 
@@ -68,6 +68,6 @@ This is a bar foo
 bar
 foo
 
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/--
+------------------------------24e78000bd32--
 </protocol>
 </verify>

tests/data/test44

@@ -29,32 +29,33 @@ bar
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|--curl).*
+^(User-Agent:|Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
 POST /we/want/44 HTTP/1.1
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 376
-Content-Type: multipart/form-data; boundary=curluczemxkcWWsxptLlAImrFQHwQ3W
+Content-Length: 412
+Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce
 
---curluczemxkcWWsxptLlAImrFQHwQ3W
+------------------------------7c633d5c27ce
 Content-Disposition: form-data; name="name"
 
 daniel
---curluczemxkcWWsxptLlAImrFQHwQ3W
+------------------------------7c633d5c27ce
 Content-Disposition: form-data; name="tool"
 
 curl
---curluczemxkcWWsxptLlAImrFQHwQ3W
+------------------------------7c633d5c27ce
 Content-Disposition: form-data; name="file"; filename="log/test44.txt"
 Content-Type: text/plain
 
 foo-
 This is a moo-
 bar
---curluczemxkcWWsxptLlAImrFQHwQ3W--
 
+------------------------------7c633d5c27ce--
 </protocol>
 </verify>

tests/data/test9

@@ -29,33 +29,34 @@ bar
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|--curl).*
+^(User-Agent:|Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
 POST /we/want/9 HTTP/1.1
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: 127.0.0.1:8999
 Pragma: no-cache
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*
-Content-Length: 375
+Content-Length: 411
 Expect: 100-continue
-Content-Type: multipart/form-data; boundary=curluczemxkcWWsxptLlAImrFQHwQ3W
+Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
 
---curluczemxkcWWsxptLlAImrFQHwQ3W
+------------------------------9ef8d6205763
 Content-Disposition: form-data; name="name"
 
 daniel
---curluczemxkcWWsxptLlAImrFQHwQ3W
+------------------------------9ef8d6205763
 Content-Disposition: form-data; name="tool"
 
 curl
---curluczemxkcWWsxptLlAImrFQHwQ3W
+------------------------------9ef8d6205763
 Content-Disposition: form-data; name="file"; filename="log/test9.txt"
 Content-Type: text/plain
 
 foo-
 This is a moo-
 bar
---curluczemxkcWWsxptLlAImrFQHwQ3W--
 
+------------------------------9ef8d6205763--
 </protocol>
 </verify>