From 41dabac76106e8a4bc667fd7102c12b5bec10056 Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Wed, 8 Aug 2018 22:43:27 +0200 Subject: Split non-portable part off test 1133 Split off testing file names with double quotes into new test 1158. Disable it for MSYS using a precheck as it doesn't support file names with double quotes (but Cygwin does, for example). Fixes https://github.com/curl/curl/issues/2796 Closes https://github.com/curl/curl/pull/2854 --- tests/data/Makefile.inc | 2 +- tests/data/test1133 | 12 +++--- tests/data/test1158 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 tests/data/test1158 diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index b1d9544fd..66d86a6cd 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -127,7 +127,7 @@ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \ test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \ test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \ -test1152 test1153 test1154 test1155 test1156 test1157 \ +test1152 test1153 test1154 test1155 test1156 test1157 test1158 \ \ test1160 test1161 test1162 test1163 test1164 \ test1170 test1171 \ diff --git a/tests/data/test1133 b/tests/data/test1133 index b8ed56b2d..d71155eda 100644 --- a/tests/data/test1133 +++ b/tests/data/test1133 @@ -26,10 +26,10 @@ http HTTP RFC1867-type formposting with filename/data contains ',', ';', '"' -http://%HOSTIP:%HTTPPORT/we/want/1133 -F "file=@\"log/test1133,a\\\"nd;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"log/test1133,a\"nd;.txt"' -F 'file3=@"log/test1133,a\"nd;.txt";type=m/f,"log/test1133,a\"nd;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b' +http://%HOSTIP:%HTTPPORT/we/want/1133 -F "file=@\"log/test1133,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"log/test1133,and;.txt"' -F 'file3=@"log/test1133,and;.txt";type=m/f,"log/test1133,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b' # We create this file before the command is invoked! - + foo bar This is a bar foo bar @@ -47,7 +47,7 @@ POST /we/want/1133 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: %HOSTIP:%HTTPPORT Accept: */* -Content-Length: 1270 +Content-Length: 1264 Expect: 100-continue Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32 @@ -61,7 +61,7 @@ bar foo ------------------------------24e78000bd32 -Content-Disposition: form-data; name="file2"; filename="test1133,a\"nd;.txt" +Content-Disposition: form-data; name="file2"; filename="test1133,and;.txt" Content-Type: text/plain foo bar @@ -73,7 +73,7 @@ foo Content-Disposition: form-data; name="file3" Content-Type: multipart/mixed; boundary=----------------------------7f0e85a48b0b -Content-Disposition: attachment; filename="test1133,a\"nd;.txt" +Content-Disposition: attachment; filename="test1133,and;.txt" Content-Type: m/f foo bar @@ -81,7 +81,7 @@ This is a bar foo bar foo -Content-Disposition: attachment; filename="test1133,a\"nd;.txt" +Content-Disposition: attachment; filename="test1133,and;.txt" Content-Type: text/plain foo bar diff --git a/tests/data/test1158 b/tests/data/test1158 new file mode 100644 index 000000000..62adc579d --- /dev/null +++ b/tests/data/test1158 @@ -0,0 +1,98 @@ + + + +HTTP +HTTP FORMPOST + + +# Server-side + + +HTTP/1.1 200 OK +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 10 + +blablabla + + + +# Client-side + + +http + + +HTTP RFC1867-type formposting with filename containing '"' + + +http://%HOSTIP:%HTTPPORT/we/want/1158 -F "file=@\"log/test1158\\\".txt\";type=mo/foo;filename=\"test1158\\\".txt\"" -F 'file2=@"log/test1158\".txt"' -F 'file3=@"log/test1158\".txt";type=m/f,"log/test1158\".txt"' + + +perl -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');" + +# We create this file before the command is invoked! + +foo bar +This is a bar foo +bar +foo + + + +# Verify data after the test has been "shot" + + +^(User-Agent:|Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).* + + +POST /we/want/1158 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: %HOSTIP:%HTTPPORT +Accept: */* +Content-Length: 954 +Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32 + +------------------------------24e78000bd32 +Content-Disposition: form-data; name="file"; filename="test1158\".txt" +Content-Type: mo/foo + +foo bar +This is a bar foo +bar +foo + +------------------------------24e78000bd32 +Content-Disposition: form-data; name="file2"; filename="test1158\".txt" +Content-Type: text/plain + +foo bar +This is a bar foo +bar +foo + +------------------------------24e78000bd32 +Content-Disposition: form-data; name="file3" +Content-Type: multipart/mixed; boundary=----------------------------7f0e85a48b0b + +Content-Disposition: attachment; filename="test1158\".txt" +Content-Type: m/f + +foo bar +This is a bar foo +bar +foo + +Content-Disposition: attachment; filename="test1158\".txt" +Content-Type: text/plain + +foo bar +This is a bar foo +bar +foo + + +------------------------------24e78000bd32-- + + + -- cgit v1.2.3