diff options
author | Daniel Stenberg <daniel@haxx.se> | 2013-03-15 17:28:32 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2013-03-27 15:30:46 +0100 |
commit | 1e29d275c643ef6aab7948f0f55a7a9397e56b42 (patch) | |
tree | 84c06b93ee8092deb48da90e1f21e29dc4a1c11d /tests/data/test1060 | |
parent | 142755fa5cdd2fea72c68663bfefeb9c6ccf5315 (diff) |
test1509: verify proxy header response headers count
Modified sws to support and use custom CONNECT responses instead of the
previously naive hard-coded version. Made the HTTP test server able to
extract test case number from the host name in a CONNECT request by
finding the number after the last dot. It makes 'machine.moo.123' use
test case 123.
Adapted a larger amount of tests to the new <connect> style.
Bug: http://curl.haxx.se/bug/view.cgi?id=1204
Reported by: Martin Jansen
Diffstat (limited to 'tests/data/test1060')
-rw-r--r-- | tests/data/test1060 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/data/test1060 b/tests/data/test1060 index 767a7ccc9..da1be78b7 100644 --- a/tests/data/test1060 +++ b/tests/data/test1060 @@ -14,7 +14,7 @@ HTTP proxy Digest auth <reply> # this is returned first since we get no proxy-auth -<data> +<connect> HTTP/1.1 407 Authorization Required to proxy me my dear
Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
Content-Length: 40000
@@ -820,7 +820,7 @@ And you should ignore this data. aaaaaaaaaaaaaaaa And you should ignore this data. aaaaaaaaaaaaaaaa And you should ignore this data. aaaaaaaaaaaaaaaa end of 1 KB aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -</data> +</connect> # this is returned when we get a GET! <data2> @@ -835,12 +835,12 @@ daniel </data2> # then this is returned when we get proxy-auth -<data1000> +<connect1000> HTTP/1.1 200 OK swsbounce
Server: no Nice proxy auth sir! -</data1000> +</connect1000> <datacheck> HTTP/1.1 407 Authorization Required to proxy me my dear
@@ -874,7 +874,7 @@ crypto HTTP proxy CONNECT auth Digest, large headers and data </name> <command> -http://test.remote.haxx.se:1060/path/10600002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel +http://test.remote.haxx.se.1060:%HTTPPORT/path/10600002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel </command> </client> @@ -884,17 +884,17 @@ http://test.remote.haxx.se:1060/path/10600002 --proxy http://%HOSTIP:%HTTPPORT - ^User-Agent: curl/.* </strip> <protocol> -CONNECT test.remote.haxx.se:1060 HTTP/1.1
-Host: test.remote.haxx.se:1060
+CONNECT test.remote.haxx.se.1060:%HTTPPORT HTTP/1.1
+Host: test.remote.haxx.se.1060:%HTTPPORT
Proxy-Connection: Keep-Alive
-CONNECT test.remote.haxx.se:1060 HTTP/1.1
-Host: test.remote.haxx.se:1060
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se:1060", response="79e394ffcd42b6c771c7582da1fc4498"
+CONNECT test.remote.haxx.se.1060:%HTTPPORT HTTP/1.1
+Host: test.remote.haxx.se.1060:%HTTPPORT
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:%HTTPPORT", response="e1fbed39c26f4efe284adc0e576ff638"
Proxy-Connection: Keep-Alive
GET /path/10600002 HTTP/1.1
-Host: test.remote.haxx.se:1060
+Host: test.remote.haxx.se.1060:%HTTPPORT
Accept: */*
</protocol> |