diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-02-20 17:10:00 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-04-04 17:03:43 +0200 |
| commit | 74851340bd7b4edbdc749e74562fc1ebcef9930f (patch) | |
| tree | 5648f921a7e79ffea2f7deb32188d3ad2ca8d3a5 /tests/data | |
| parent | d3d27551e716e4899ef8fea7ac416f1d6c654f96 (diff) | |
PROXYHEADER: send these headers in "normal" proxy requests too
Updated the docs to clarify and the code accordingly, with test 1528 to
verify:
When CURLHEADER_SEPARATE is set and libcurl is asked to send a request
to a proxy but it isn't CONNECT, then _both_ header lists
(CURLOPT_HTTPHEADER and CURLOPT_PROXYHEADER) will be used since the
single request is then made for both the proxy and the server.
Diffstat (limited to 'tests/data')
| -rw-r--r-- | tests/data/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/data/test1528 | 60 |
2 files changed, 61 insertions, 1 deletions
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index fc7e19078..d1a87468b 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -129,7 +129,7 @@ test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \ test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \ test1516 \ \ -test1525 test1526 test1527 \ +test1525 test1526 test1527 test1528 \ \ test1900 test1901 test1902 test1903 \ \ diff --git a/tests/data/test1528 b/tests/data/test1528 new file mode 100644 index 000000000..876806af4 --- /dev/null +++ b/tests/data/test1528 @@ -0,0 +1,60 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +HTTP CONNECT +HTTP proxy +proxytunnel +</keywords> +</info> + +# Server-side +<reply> +<connect> +HTTP/1.1 200 OK
+We-are: good
+
+</connect> +<data> +HTTP/1.1 200 OK swsclose
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Content-Length: 5
+ +stop +</data> + +</reply> +# Client-side +<client> +<server> +http +http-proxy +</server> +<tool> +lib1528 +</tool> + <name> +Separately specified proxy/server headers sent in a proxy GET + </name> + <command> + http://the.old.moo:%HTTPPORT/1528 %HOSTIP:%PROXYPORT +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<proxy> +GET http://the.old.moo:%HTTPPORT/1528 HTTP/1.1
+Host: the.old.moo:%HTTPPORT
+Accept: */*
+Proxy-Connection: Keep-Alive
+User-Agent: Http Agent
+Proxy-User-Agent: Http Agent2
+
+</proxy> +</verify> +</testcase> |