From 1e29d275c643ef6aab7948f0f55a7a9397e56b42 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 15 Mar 2013 17:28:32 +0100 Subject: 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 style. Bug: http://curl.haxx.se/bug/view.cgi?id=1204 Reported by: Martin Jansen --- tests/data/test1097 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests/data/test1097') diff --git a/tests/data/test1097 b/tests/data/test1097 index ebb039962..b899810d0 100644 --- a/tests/data/test1097 +++ b/tests/data/test1097 @@ -18,13 +18,15 @@ Content-Length: 27 This is all fine and dandy - + + HTTP/1.1 200 We are fine and cool Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2 Content-Length: 27 This is all fine and dandy - + + HTTP/1.1 200 We are fine and cool Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2 @@ -50,7 +52,7 @@ NTLM HTTP POST using CONNECT with --proxy-ntlm but no auth is required -http://test.a.galaxy.far.far.away:1097/1097 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -d "dummy=value" -p +http://test.a.galaxy.far.far.away.1097:%HTTPPORT/1097 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm -d "dummy=value" -p @@ -60,15 +62,15 @@ http://test.a.galaxy.far.far.away:1097/1097 --proxy http://%HOSTIP:%HTTPPORT --p ^User-Agent: curl/.* -CONNECT test.a.galaxy.far.far.away:1097 HTTP/1.1 -Host: test.a.galaxy.far.far.away:1097 +CONNECT test.a.galaxy.far.far.away.1097:%HTTPPORT HTTP/1.1 +Host: test.a.galaxy.far.far.away.1097:%HTTPPORT Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= User-Agent: curl/7.19.5-CVS (i686-pc-linux-gnu) libcurl/7.19.5-CVS OpenSSL/0.9.8g zlib/1.2.3.3 c-ares/1.6.1-CVS libidn/1.12 libssh2/1.0.1_CVS Proxy-Connection: Keep-Alive POST /1097 HTTP/1.1 User-Agent: curl/7.19.5-CVS (i686-pc-linux-gnu) libcurl/7.19.5-CVS OpenSSL/0.9.8g zlib/1.2.3.3 c-ares/1.6.1-CVS libidn/1.12 libssh2/1.0.1_CVS -Host: test.a.galaxy.far.far.away:1097 +Host: test.a.galaxy.far.far.away.1097:%HTTPPORT Accept: */* Content-Length: 0 Content-Type: application/x-www-form-urlencoded -- cgit v1.2.3