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
This commit is contained in:
Daniel Stenberg
2013-03-15 17:28:32 +01:00
parent 142755fa5c
commit 1e29d275c6
30 changed files with 495 additions and 263 deletions

View File

@@ -14,16 +14,18 @@ HTTP proxy Digest auth
<reply>
<servercmd>
connection-monitor
auth_required
</servercmd>
# 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: 33
And you should ignore this data.
</data>
</connect>
# this is returned when we get a GET!
<data2>
@@ -38,11 +40,11 @@ daniel
</data2>
# then this is returned when we get proxy-auth
<data1000>
<connect1000>
HTTP/1.1 200 OK swsbounce
Server: no
</data1000>
</connect1000>
<datacheck>
HTTP/1.1 407 Authorization Required to proxy me my dear
@@ -75,7 +77,7 @@ crypto
HTTP proxy CONNECT auth Digest
</name>
<command>
http://test.remote.haxx.se:206/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
http://test.remote.haxx.se.206:%HTTPPORT/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
</command>
</client>
@@ -85,18 +87,18 @@ http://test.remote.haxx.se:206/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --p
^User-Agent: curl/.*
</strip>
<protocol>
CONNECT test.remote.haxx.se:206 HTTP/1.1
Host: test.remote.haxx.se:206
CONNECT test.remote.haxx.se.206:%HTTPPORT HTTP/1.1
Host: test.remote.haxx.se.206:%HTTPPORT
Proxy-Connection: Keep-Alive
CONNECT test.remote.haxx.se:206 HTTP/1.1
Host: test.remote.haxx.se:206
Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se:206", response="676e0836f3e1c5b31bf29770ef9d8224"
CONNECT test.remote.haxx.se.206:%HTTPPORT HTTP/1.1
Host: test.remote.haxx.se.206:%HTTPPORT
Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.206:%HTTPPORT", response="003e36decb4dbf6366b3ecb9b87c24ec"
Proxy-Connection: Keep-Alive
GET /path/2060002 HTTP/1.1
User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
Host: test.remote.haxx.se:206
Host: test.remote.haxx.se.206:%HTTPPORT
Accept: */*
[DISCONNECT]