summaryrefslogtreecommitdiff
path: root/tests/data/test80
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2011-12-17 23:47:22 +0100
committerDaniel Stenberg <daniel@haxx.se>2012-01-03 15:01:22 +0100
commit82180643f4886d47816cf654f2ee46114e9c296f (patch)
treeee7b55634dbeca7fd641397a6c10dd360cc602d4 /tests/data/test80
parent585b89a6c3640af5a1ca963eeafc7d0d82408f00 (diff)
downloadcurl-82180643f4886d47816cf654f2ee46114e9c296f.tar.gz
test proxy supports CONNECT
There's a new 'http-proxy' server for tests that runs on a separate port and lets clients do HTTP CONNECT to other ports on the same host to allow us to test HTTP "tunneling" properly. Test cases now have a <proxy> section in <verify> to check that the proxy protocol part matches correctly. Test case 80, 83, 95, 275, 503 and 1078 have been converted. Test 1316 was added.
Diffstat (limited to 'tests/data/test80')
-rw-r--r--tests/data/test809
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/data/test80 b/tests/data/test80
index a405af7a1..2fa196910 100644
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -43,12 +43,13 @@ contents
<client>
<server>
http
+http-proxy
</server>
<name>
-HTTP 1.0 CONNECT with proxytunnel and host Basic authentication
+HTTP 1.0 CONNECT with proxytunnel and proxy+host Basic authentication
</name>
<command>
-http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p --proxy1.0 %HOSTIP:%HTTPPORT --user iam:myself --proxy-user youare:yourself
+http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p --proxy1.0 %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself
</command>
</client>
@@ -58,13 +59,15 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/80 -p --proxy1.0 %HOSTIP:%HTTPPORT --
<strip>
^User-Agent:.*
</strip>
-<protocol>
+<proxy>
CONNECT %HOSTIP:%HTTPPORT HTTP/1.0
Host: %HOSTIP:%HTTPPORT
Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm
User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
Proxy-Connection: Keep-Alive
+</proxy>
+<protocol>
GET /we/want/that/page/80 HTTP/1.1
Authorization: Basic aWFtOm15c2VsZg==
User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3