diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2011-08-04 17:48:45 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2011-08-04 17:48:45 +0200 |
| commit | 519d0c0dd2536b192a233995f4e101a2aa00e5f3 (patch) | |
| tree | bdcc013170bbbc84290304f718d3be23fdf66050 /tests/data | |
| parent | d2c22411afd664bfc1959c41e301781e4cd725f3 (diff) | |
-J: support ';' in quoted file names
Content-disposition headers can provide file names with semicolons which
previously would be cut off at that point.
Added test case 1311 and 1312 to verify -J.
Bug: http://curl.haxx.se/bug/view.cgi?id=3375603
Reported by: Peter Hjalmarsson
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/data/test1311 | 64 | ||||
| -rw-r--r-- | tests/data/test1312 | 64 |
3 files changed, 129 insertions, 1 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index b6e0ab8b5..76954a3ec 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -73,7 +73,7 @@ test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \ test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \ test1126 test1127 test1128 test1129 test1130 test1131 test1200 test1201 \ test1202 test1203 test1300 test1301 test1302 test1303 test1304 test1305 \ -test1306 test1307 test1308 test1309 test1310 \ +test1306 test1307 test1308 test1309 test1310 test1311 test1312 \ test2000 test2001 test2002 test2003 test2004 EXTRA_DIST = $(TESTCASES) DISABLED diff --git a/tests/data/test1311 b/tests/data/test1311 new file mode 100644 index 000000000..e47647c38 --- /dev/null +++ b/tests/data/test1311 @@ -0,0 +1,64 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +-J +</keywords> +</info> + +# +<reply> +<data nocheck="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html +Content-Disposition: filename=name1311; charset=funny; option=strange + +12345 +</data> +</reply> + +# +# Client-side +<client> +# this relies on the debug feature to allow us to set directory to store the +# -J output in +<features> +debug +</features> +<server> +http +</server> +<name> +HTTP GET with -J and Content-Disposition +</name> +<setenv> +CURL_TESTDIR=%PWD/log +</setenv> +<command option="no-output,no-include"> +http://%HOSTIP:%HTTPPORT/1311 -J -O +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1311 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<file name="log/name1311"> +12345 +</file> + +</verify> +</testcase> diff --git a/tests/data/test1312 b/tests/data/test1312 new file mode 100644 index 000000000..92144015a --- /dev/null +++ b/tests/data/test1312 @@ -0,0 +1,64 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +-J +</keywords> +</info> + +# +<reply> +<data nocheck="yes"> +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 6 +Connection: close +Content-Type: text/html +Content-Disposition: inline; filename="name1312;weird" + +12345 +</data> +</reply> + +# +# Client-side +<client> +# this relies on the debug feature to allow us to set directory to store the +# -J output in +<features> +debug +</features> +<server> +http +</server> +<name> +HTTP GET with -J, Content-Disposition and ; in filename +</name> +<setenv> +CURL_TESTDIR=%PWD/log +</setenv> +<command option="no-output,no-include"> +http://%HOSTIP:%HTTPPORT/1312 -J -O +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1312 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<file name="log/name1312;weird"> +12345 +</file> + +</verify> +</testcase> |