Revert "Imported Upstream version 7.44.0"

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

diff --git a/tests/data/test275 b/tests/data/test275
index 145c163..ac54e25 100644 (file)
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -14,6 +14,12 @@ proxytunnel
 #
 # Server-side
 <reply>
+<connect>
+HTTP/1.1 200 OK\r
+Connected-fine: sure\r
+\r
+</connect>
+
 <data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
@@ -24,7 +30,8 @@ Content-Length: 9
 contents
 </data>
 <datacheck>
-HTTP/1.1 200 Mighty fine indeed\r
+HTTP/1.1 200 OK\r
+Connected-fine: sure\r
 \r
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
@@ -41,12 +48,13 @@ contents
 <client>
 <server>
 http
+http-proxy
 </server>
  <name>
 HTTP CONNECT with proxytunnel getting two URLs from the same host
  </name>
  <command>
-http://remotesite.com/we/want/that/page/275 -p -x %HOSTIP:%HTTPPORT --user iam:myself --proxy-user youare:yourself http://remotesite.com/we/want/that/page/275
+http://remotesite.com.275:%HTTPPORT/we/want/that/page/275 -p -x %HOSTIP:%PROXYPORT --user iam:myself --proxy-user youare:yourself http://remotesite.com.275:%HTTPPORT/we/want/that/page/275
 </command>
 </client>
 
@@ -56,21 +64,23 @@ http://remotesite.com/we/want/that/page/275 -p -x %HOSTIP:%HTTPPORT --user iam:m
 <strip>
 ^User-Agent:.*
 </strip>
-<protocol>
-CONNECT remotesite.com:80 HTTP/1.1\r
-Host: remotesite.com:80\r
+<proxy>
+CONNECT remotesite.com.275:%HTTPPORT HTTP/1.1\r
+Host: remotesite.com.275:%HTTPPORT\r
 Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm\r
 User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3\r
 Proxy-Connection: Keep-Alive\r
 \r
+</proxy>
+<protocol>
 GET /we/want/that/page/275 HTTP/1.1\r
 Authorization: Basic aWFtOm15c2VsZg==\r
-Host: remotesite.com\r
+Host: remotesite.com.275:%HTTPPORT\r
 Accept: */*\r
 \r
 GET /we/want/that/page/275 HTTP/1.1\r
 Authorization: Basic aWFtOm15c2VsZg==\r
-Host: remotesite.com\r
+Host: remotesite.com.275:%HTTPPORT\r
 Accept: */*\r
 \r
 </protocol>