diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2016-09-21 15:34:57 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2016-09-21 17:23:24 -0400 |
| commit | 36e53ec6ff93cf2c20934f65fb405c662ff0f604 (patch) | |
| tree | 2ceac22333eeb6bc80700ca5f896ddc6ed20ae8a /tests/data | |
| parent | 82279c82c8d94d8999de68fceadb4f1d7cd0df3b (diff) | |
docs: Remove that --proto is just used for initial retrieval
.. and add that --proto-redir and CURLOPT_REDIR_PROTOCOLS do not
override protocols denied by --proto and CURLOPT_PROTOCOLS.
- Add a test to enforce: --proto deny must override --proto-redir allow
Closes https://github.com/curl/curl/pull/1031
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/Makefile.inc | 2 | ||||
| -rw-r--r-- | tests/data/test1245 | 63 |
2 files changed, 64 insertions, 1 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 9b931d7d0..a3d315abb 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -127,7 +127,7 @@ test1216 test1217 test1218 test1219 \ test1220 test1221 test1222 test1223 test1224 test1225 test1226 test1227 \ test1228 test1229 test1230 test1231 test1232 test1233 test1234 test1235 \ test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \ -test1244 \ +test1244 test1245 \ \ test1300 test1301 test1302 test1303 test1304 test1305 test1306 test1307 \ test1308 test1309 test1310 test1311 test1312 test1313 test1314 test1315 \ diff --git a/tests/data/test1245 b/tests/data/test1245 new file mode 100644 index 000000000..34d6549de --- /dev/null +++ b/tests/data/test1245 @@ -0,0 +1,63 @@ +<testcase> +<info> +<keywords> +FTP +HTTP +HTTP GET +--proto +--proto-redir +followlocation +</keywords> +</info> + +# +# Server-side +<reply> +<data> +HTTP/1.1 301 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Content-Length: 0
+Location: ftp://127.0.0.1:8992/1245
+Connection: close
+
+</data> +</reply> + +# +# Client-side +<client> +<server> +ftp +http +</server> +<name> +--proto deny must override --proto-redir allow +</name> +<command> +--location --proto +all,-ftp --proto-redir -all,+ftp http://%HOSTIP:%HTTPPORT/1245 +</command> +# The data section doesn't do variable substitution, so we must assert this +<precheck> +perl -e "print 'Test requires default test server host and port' if ( '%HOSTIP' ne '127.0.0.1' || '%FTPPORT' ne '8992' );" +</precheck> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1245 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +# 1 - Protocol ftp not supported or disabled in libcurl +<errorcode> +1 +</errorcode> +</verify> +</testcase> |