tests: 1078 1288 1297 use valid IPv4 addresses

With the enhanced URL parser, these tests failed because of their bad
IPv4 use.

diff --git a/tests/data/test1078 b/tests/data/test1078
index 6f303d0bc4f7da438a790162ffdd9e4772685110..2e1defac3b13f12f4c1e04d9d660492fa505bc53 100644 (file)
--- a/tests/data/test1078
+++ b/tests/data/test1078
@@ -43,7 +43,7 @@ http-proxy
 HTTP 1.0 CONNECT with proxytunnel and downgrade GET to HTTP/1.0
  </name>
  <command>
---proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
+--proxy1.0 %HOSTIP:%PROXYPORT -p http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -54,20 +54,20 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.0\r
-Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
+CONNECT %HOSTIP:%HTTPPORT HTTP/1.0\r
+Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
+Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/want/that/page/%TESTNUMBER HTTP/1.0\r
-Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
+Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1288 b/tests/data/test1288
index 583fc42f32fca761abfc2823b045c0b265a13aea..e94bd5104d295674e2c9fbefde6f7c2e9c566fc1 100644 (file)
--- a/tests/data/test1288
+++ b/tests/data/test1288
@@ -42,7 +42,7 @@ http-proxy
 Suppress proxy CONNECT response headers
 </name>
 <command>
---proxytunnel --suppress-connect-headers --dump-header - --include --write-out "\nCONNECT CODE: %{http_connect}\nRECEIVED HEADER BYTE TOTAL: %{size_header}\n" --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
+--proxytunnel --suppress-connect-headers --dump-header - --include --write-out "\nCONNECT CODE: %{http_connect}\nRECEIVED HEADER BYTE TOTAL: %{size_header}\n" --proxy %HOSTIP:%PROXYPORT http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -53,15 +53,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
+CONNECT %HOSTIP:%HTTPPORT HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
+Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1297 b/tests/data/test1297
index f4103622388294883ae59ddacd0d47d8a0991e53..386154af30b34a20b1714a120096adba190c5193 100644 (file)
--- a/tests/data/test1297
+++ b/tests/data/test1297
@@ -33,7 +33,7 @@ http-proxy
 CONNECT to peer that returns nothing
 </name>
 <command>
---proxytunnel --proxy %HOSTIP:%PROXYPORT http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER
+--proxytunnel --proxy %HOSTIP:%PROXYPORT http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER
 </command>
 <features>
 proxy
@@ -44,15 +44,15 @@ proxy
 # Verify data after the test has been "shot"
 <verify>
 <proxy>
-CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
-Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
+CONNECT %HOSTIP:%HTTPPORT HTTP/1.1\r
+Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
-Host: %HOSTIP.%TESTNUMBER:%HTTPPORT\r
+Host: %HOSTIP:%HTTPPORT\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r