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/test1021 | |
| 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/test1021')
| -rw-r--r-- | tests/data/test1021 | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/data/test1021 b/tests/data/test1021 index 1979f7507..81127249a 100644 --- a/tests/data/test1021 +++ b/tests/data/test1021 @@ -12,32 +12,32 @@ HTTP proxy NTLM auth # Server-side <reply> -<data> +<connect> HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
Proxy-Authenticate: NTLM
Content-Length: 21
Connection: close
data to discard -</data> +</connect> # this is returned first since we get no proxy-auth -<data1001> +<connect1001> HTTP/1.1 407 Authorization Required to proxy me my dear
Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
Content-Length: 28
And you should ignore this data.
-</data1001> +</connect1001> # This is supposed to be returned when the server gets the second # Authorization: NTLM line passed-in from the client -<data1002> +<connect1002> HTTP/1.1 200 Things are fine in proxy land
Server: Microsoft-IIS/5.0
Content-Type: text/html; charset=iso-8859-1
-</data1002> +</connect1002> # this is returned when we get a GET! <data2> @@ -102,7 +102,7 @@ CURL_GETHOSTNAME=curlhost LD_PRELOAD=%PWD/libtest/.libs/libhostname.so </setenv> <command> -http://test.remote.example.com:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel +http://test.remote.example.com.1021:%HTTPPORT/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel </command> <precheck> chkhostname curlhost @@ -115,23 +115,23 @@ chkhostname curlhost ^User-Agent: curl/.* </strip> <protocol> -CONNECT test.remote.example.com:1021 HTTP/1.1
-Host: test.remote.example.com:1021
+CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.1021:%HTTPPORT
Proxy-Connection: Keep-Alive
-CONNECT test.remote.example.com:1021 HTTP/1.1
-Host: test.remote.example.com:1021
+CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.1021:%HTTPPORT
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
Proxy-Connection: Keep-Alive
-CONNECT test.remote.example.com:1021 HTTP/1.1
-Host: test.remote.example.com:1021
+CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
+Host: test.remote.example.com.1021:%HTTPPORT
Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAAIAAgAdQAAAAAAAAAAAAAABoKBAKAeQjzKtCQ7ubW8S6MN7B59436GAxPu0CVROwwNBsgxML49gcbAXLT/bU+H5wrS9XNpbGx5Y3VybGhvc3Q=
Proxy-Connection: Keep-Alive
GET /path/10210002 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.example.com:1021
+Host: test.remote.example.com.1021:%HTTPPORT
Accept: */*
</protocol> |