summaryrefslogtreecommitdiff
path: root/tests/data/test1061
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-03-15 17:28:32 +0100
committerDaniel Stenberg <daniel@haxx.se>2013-03-27 15:30:46 +0100
commit1e29d275c643ef6aab7948f0f55a7a9397e56b42 (patch)
tree84c06b93ee8092deb48da90e1f21e29dc4a1c11d /tests/data/test1061
parent142755fa5cdd2fea72c68663bfefeb9c6ccf5315 (diff)
downloadcurl-1e29d275c643ef6aab7948f0f55a7a9397e56b42.tar.gz
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/test1061')
-rw-r--r--tests/data/test106122
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/data/test1061 b/tests/data/test1061
index 0fb8c5110..05c3209c4 100644
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -15,7 +15,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"
Transfer-Encoding: chunked
@@ -825,7 +825,7 @@ end of 1 KB aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
0
-</data>
+</connect>
# this is returned when we get a GET!
<data2>
@@ -840,12 +840,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
@@ -879,7 +879,7 @@ crypto
HTTP proxy CONNECT auth Digest, large headers and chunked data
</name>
<command>
-http://test.remote.haxx.se:1061/path/10610002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se.1061:%HTTPPORT/path/10610002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
</command>
</client>
@@ -889,17 +889,17 @@ http://test.remote.haxx.se:1061/path/10610002 --proxy http://%HOSTIP:%HTTPPORT -
^User-Agent: curl/.*
</strip>
<protocol>
-CONNECT test.remote.haxx.se:1061 HTTP/1.1
-Host: test.remote.haxx.se:1061
+CONNECT test.remote.haxx.se.1061:%HTTPPORT HTTP/1.1
+Host: test.remote.haxx.se.1061:%HTTPPORT
Proxy-Connection: Keep-Alive
-CONNECT test.remote.haxx.se:1061 HTTP/1.1
-Host: test.remote.haxx.se:1061
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se:1061", response="8e96acf6a6214012183879e28e73b2d3"
+CONNECT test.remote.haxx.se.1061:%HTTPPORT HTTP/1.1
+Host: test.remote.haxx.se.1061:%HTTPPORT
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:%HTTPPORT", response="4e23449fa93224834299e7282a70472c"
Proxy-Connection: Keep-Alive
GET /path/10610002 HTTP/1.1
-Host: test.remote.haxx.se:1061
+Host: test.remote.haxx.se.1061:%HTTPPORT
Accept: */*
</protocol>