Imported Upstream version 7.59.0

[platform/upstream/curl.git] / tests / data / test503

diff --git a/tests/data/test503 b/tests/data/test503
index 3f29d8f..c1205bf 100644 (file)
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -13,6 +13,13 @@ multi
 
 # Server-side
 <reply>
+<servercmd>
+connection-monitor
+</servercmd>
+<connect>
+HTTP/1.1 200 Mighty fine indeed
+
+</connect>
 <data>
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
@@ -22,8 +29,8 @@ ETag: "21025-dc7-39462498"
 
 </data>
 <datacheck>
-HTTP/1.1 200 Mighty fine indeed\r
-\r
+HTTP/1.1 200 Mighty fine indeed
+
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@@ -37,6 +44,7 @@ ETag: "21025-dc7-39462498"
 <client>
 <server>
 http
+http-proxy
 </server>
 # tool is what to use instead of 'curl'
 <tool>
@@ -47,7 +55,7 @@ lib503
 simple multi http:// through proxytunnel with authentication info
  </name>
  <command>
-http://%HOSTIP:%HTTPSPORT/503 %HOSTIP:%HTTPPORT
+http://machine.503:%HTTPPORT/503 %HOSTIP:%PROXYPORT
 </command>
 <file name="log/test503.txt">
 foo
@@ -60,17 +68,20 @@ moo
 
 # Verify data after the test has been "shot"
 <verify>
+<proxy>
+CONNECT machine.503:%HTTPPORT HTTP/1.1
+Host: machine.503:%HTTPPORT
+Proxy-Authorization: Basic dGVzdDppbmc=
+Proxy-Connection: Keep-Alive
+
+</proxy>
 <protocol>
-CONNECT %HOSTIP:%HTTPSPORT HTTP/1.1\r
-Host: %HOSTIP:%HTTPSPORT\r
-Proxy-Authorization: Basic dGVzdDppbmc=\r
-Proxy-Connection: Keep-Alive\r
-\r
-GET /503 HTTP/1.1\r
-Authorization: Basic dGVzdDppbmc=\r
-Host: %HOSTIP:%HTTPSPORT\r
-Accept: */*\r
-\r
+GET /503 HTTP/1.1
+Host: machine.503:%HTTPPORT
+Authorization: Basic dGVzdDppbmc=
+Accept: */*
+
+[DISCONNECT]
 </protocol>
 </verify>
 </testcase>