adjusted the formpost testcases to the new boundary string construction

diff --git a/tests/data/test304 b/tests/data/test304
index fe1559d5ad1fef813976066534a632797a36594c..69f654ba2e6ea67c2e060893c7418768a981fd53 100644 (file)
--- a/tests/data/test304
+++ b/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\r
-User-Agent: curl/7.9.5-pre4 (sparc-sun-solaris2.7) libcurl 7.9.5-pre4 (OpenSSL 0.9.6c) (krb4 enabled)\r
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: 127.0.0.1:8433\r
 Pragma: no-cache\r
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
-Content-Length: 1354\r
+Content-Length: 1390\r
 Expect: 100-continue\r
-Content-Type: multipart/form-data; boundary=curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ\r
+Content-Type: multipart/form-data; boundary=----------------------------c3b2ef7f0bb8\r
 \r
---curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ\r
+------------------------------c3b2ef7f0bb8\r
 Content-Disposition: form-data; name="name"\r
 \r
 daniel\r
---curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ\r
+------------------------------c3b2ef7f0bb8\r
 Content-Disposition: form-data; name="tool"\r
 \r
 curl\r
---curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ\r
+------------------------------c3b2ef7f0bb8\r
 Content-Disposition: form-data; name="file"; filename="log/test304.txt"\r
 Content-Type: text/plain\r
 \r
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 \r
---curlfPpkLyYwSYaH6Fkg0WkEldoJyAQ--\r
+------------------------------c3b2ef7f0bb8--\r
 </protocol>
 </verify>

diff --git a/tests/data/test39 b/tests/data/test39
index 52c35a5c4370e96fb76bbae21fe23ef8a84291b6..e4f7f3cf7315dc4b4199e40bc3e8124df6d19524 100644 (file)
--- a/tests/data/test39
+++ b/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\r
-User-Agent: curl/7.9.5 (sparc-sun-solaris2.7) libcurl 7.9.5 (OpenSSL 0.9.6c) (krb4 enabled)\r
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: 127.0.0.1:8999\r
 Pragma: no-cache\r
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
-Content-Length: 553\r
+Content-Length: 598\r
 Expect: 100-continue\r
-Content-Type: multipart/form-data; boundary=curl4T+HO20DMiXx0k2FI9gR0lqf7C/\r
+Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32\r
 \r
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/\r
+------------------------------24e78000bd32\r
 Content-Disposition: form-data; name="name"\r
 \r
 daniel\r
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/\r
+------------------------------24e78000bd32\r
 Content-Disposition: form-data; name="tool"\r
 \r
 curl\r
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/\r
+------------------------------24e78000bd32\r
 Content-Disposition: form-data; name="file"; filename="fakerfile"\r
 Content-Type: moo/foobar\r
 \r
@@ -59,7 +59,7 @@ This is a bar foo
 bar
 foo
 \r
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/\r
+------------------------------24e78000bd32\r
 Content-Disposition: form-data; name="file2"; filename="log/test39.txt"\r
 Content-Type: text/plain\r
 \r
@@ -68,6 +68,6 @@ This is a bar foo
 bar
 foo
 \r
---curl4T+HO20DMiXx0k2FI9gR0lqf7C/--\r
+------------------------------24e78000bd32--\r
 </protocol>
 </verify>

diff --git a/tests/data/test44 b/tests/data/test44
index 8a1d29247f3d38f29c40e0c3fc40e608cb5c63fd..14fa41b8c0aa021554812c9d55554e1f53072941 100644 (file)
--- a/tests/data/test44
+++ b/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\r
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: 127.0.0.1:8999\r
 Pragma: no-cache\r
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
-Content-Length: 376\r
-Content-Type: multipart/form-data; boundary=curluczemxkcWWsxptLlAImrFQHwQ3W\r
+Content-Length: 412\r
+Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce\r
 \r
---curluczemxkcWWsxptLlAImrFQHwQ3W\r
+------------------------------7c633d5c27ce\r
 Content-Disposition: form-data; name="name"\r
 \r
 daniel\r
---curluczemxkcWWsxptLlAImrFQHwQ3W\r
+------------------------------7c633d5c27ce\r
 Content-Disposition: form-data; name="tool"\r
 \r
 curl\r
---curluczemxkcWWsxptLlAImrFQHwQ3W\r
+------------------------------7c633d5c27ce\r
 Content-Disposition: form-data; name="file"; filename="log/test44.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
 This is a moo-
 bar
---curluczemxkcWWsxptLlAImrFQHwQ3W--\r
 \r
+------------------------------7c633d5c27ce--\r
 </protocol>
 </verify>

diff --git a/tests/data/test9 b/tests/data/test9
index cfa981816659efaed094298c2579821ff5a990a8..ec5b3d35b968cb798c0b0e9d70d6608b76ff9d71 100644 (file)
--- a/tests/data/test9
+++ b/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\r
+User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: 127.0.0.1:8999\r
 Pragma: no-cache\r
 Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*\r
-Content-Length: 375\r
+Content-Length: 411\r
 Expect: 100-continue\r
-Content-Type: multipart/form-data; boundary=curluczemxkcWWsxptLlAImrFQHwQ3W\r
+Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763\r
 \r
---curluczemxkcWWsxptLlAImrFQHwQ3W\r
+------------------------------9ef8d6205763\r
 Content-Disposition: form-data; name="name"\r
 \r
 daniel\r
---curluczemxkcWWsxptLlAImrFQHwQ3W\r
+------------------------------9ef8d6205763\r
 Content-Disposition: form-data; name="tool"\r
 \r
 curl\r
---curluczemxkcWWsxptLlAImrFQHwQ3W\r
+------------------------------9ef8d6205763\r
 Content-Disposition: form-data; name="file"; filename="log/test9.txt"\r
 Content-Type: text/plain\r
 \r
 foo-
 This is a moo-
 bar
---curluczemxkcWWsxptLlAImrFQHwQ3W--\r
 \r
+------------------------------9ef8d6205763--\r
 </protocol>
 </verify>