runtests: provide curl's version string as %VERSION for tests

... so that we can check HTTP requests for User-Agent: curl/%VERSION

Update 600+ test cases accordingly.

Closes #6037

diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index 7748b6706131d18510a56489ead9a62ce68973a0..c2cc1016ea9ca93e46edee3b720b256063903ef2 100644 (file)
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -106,6 +106,7 @@ Available substitute variables include:
 - `%TFTP6PORT` - IPv6 port number of the TFTP server
 - `%TFTPPORT` - Port number of the TFTP server
 - `%USER` - Login ID of the user running the test
+- `%VERSION` - the full version number of the tested curl
 
 # `<testcase>`
 

diff --git a/tests/data/test1 b/tests/data/test1
index 7c0e1602a00335c6b757b1a18c5b1a4a778551ed..461375b628d1c1454522fb42fc6a7508931ebaeb 100644 (file)
--- a/tests/data/test1
+++ b/tests/data/test1
@@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT/1
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test10 b/tests/data/test10
index 806aa697ff5d465af5d8af2ba6d838944e4bbcfa..c5053b5db6ab5a5b861542bf788390350285326a 100644 (file)
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -43,12 +43,10 @@ the
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /we/want/10 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 Expect: 100-continue\r

diff --git a/tests/data/test1001 b/tests/data/test1001
index 53d7da3810bde8d3d17999538a94527804aab3ad..6edaade79d45f0ee1ce3bf35fb7b97f029735c70 100644 (file)
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -81,14 +81,11 @@ test
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -97,6 +94,7 @@ GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1001", response="6af4d89c952f4dd4cc215a6878dc499d"\r
 Content-Range: bytes 2-4/5\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 3\r

diff --git a/tests/data/test1002 b/tests/data/test1002
index 5b6ef9431575de9cc079983a40c17a758d791e41..7ec7501f795e61dd55b7b6f285cb7bdf7e6269c5 100644 (file)
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -80,14 +80,11 @@ test
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -96,6 +93,7 @@ GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"\r
 Content-Range: bytes 2-4/5\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 3\r
@@ -105,7 +103,7 @@ st
 GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
-User-Agent: curl/7.16.1\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -114,7 +112,7 @@ GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload2", response="d711f0d2042786d930de635ba0d1a1d0"\r
 Content-Range: bytes 2-4/5\r
-User-Agent: curl/7.16.1\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 3\r

diff --git a/tests/data/test1004 b/tests/data/test1004
index 955163b365d41941ba94ac89a04044bfab40232c..05e92a598eda47b29e91f419ee4f89074601299a 100644 (file)
--- a/tests/data/test1004
+++ b/tests/data/test1004
@@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/1004 --proxy ""
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1004 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1008 b/tests/data/test1008
index a1ef0dd7a9b9f574a5e1ceac388ba38ef41390ca..a076fa0d49502150461cda4dd011074c1569f4c2 100644 (file)
--- a/tests/data/test1008
+++ b/tests/data/test1008
@@ -110,23 +110,22 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1008:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1008:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10080002 HTTP/1.1\r
-User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r
 Host: test.remote.example.com.1008:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 [DISCONNECT]

diff --git a/tests/data/test1011 b/tests/data/test1011
index 566867dd611bf5c894b311f9cb9960f55bdb5a56..6d3297a7615f5ffc3b6e02184f24903b8f9e7b6d 100644 (file)
--- a/tests/data/test1011
+++ b/tests/data/test1011
@@ -56,19 +56,17 @@ http://%HOSTIP:%HTTPPORT/blah/1011 -L -d "moo"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /blah/1011 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 mooGET /blah/moo.html&testcase=/10110002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1012 b/tests/data/test1012
index 4edc1731e43179daebe85db722edb81772e23e82..943db91c0fc243b433df99a142a1af0064a3d2d4 100644 (file)
--- a/tests/data/test1012
+++ b/tests/data/test1012
@@ -56,19 +56,17 @@ http://%HOSTIP:%HTTPPORT/blah/1012 -L -d "moo" --post301
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /blah/1012 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 mooPOST /blah/moo.html&testcase=/10120002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1015 b/tests/data/test1015
index a2b2cefa1ec35d4cc2ddafcef76ff1d4ee9470db..c568b867832fcadac5a5b665e6bcf49a09e854cf 100644 (file)
--- a/tests/data/test1015
+++ b/tests/data/test1015
@@ -38,13 +38,10 @@ content to _?!#$'|<>
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /1015 HTTP/1.1\r
-User-Agent: curl/7.17.2-CVS (i686-pc-linux-gnu) libcurl/7.17.2-CVS OpenSSL/0.9.8g zlib/1.2.3.3 c-ares/1.5.2-CVS libidn/1.1 libssh2/0.19.0-C\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 133\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1021 b/tests/data/test1021
index 84d1e62a73db39eb06d3eb7ca8387b17a3773f7f..10a0314ad758f2a6c8b1067cd1bcb3aca967b6cc 100644 (file)
--- a/tests/data/test1021
+++ b/tests/data/test1021
@@ -115,27 +115,27 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1021:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1021:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.1021:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10210002 HTTP/1.1\r
-User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r
 Host: test.remote.example.com.1021:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1024 b/tests/data/test1024
index 086ef267a10121dd01eabebedae02357085b9271..4971eedbdb4f78661185c320985a4b3946d90187 100644 (file)
--- a/tests/data/test1024
+++ b/tests/data/test1024
@@ -81,20 +81,20 @@ http://%HOSTIP:%HTTPPORT/want/1024 -L -c log/jar1024
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1024 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /data/10240002.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/10240003.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: firstcookie=want\r
 \r

diff --git a/tests/data/test1025 b/tests/data/test1025
index 494f8f8d508102231880a9db543a633d95794612..66f7532b46e80fb78e78088427c9b492a25215f0 100644 (file)
--- a/tests/data/test1025
+++ b/tests/data/test1025
@@ -81,22 +81,22 @@ http://%HOSTIP:%HTTPPORT/want/1025 -L -c log/jar1025 -b forcedcookie=yes
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1025 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: forcedcookie=yes\r
 \r
 GET /data/10250002.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: forcedcookie=yes\r
 \r
 GET /want/10250003.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: firstcookie=want; forcedcookie=yes\r
 \r

diff --git a/tests/data/test1028 b/tests/data/test1028
index b154372afd0732ae4c04d2371eff2746f74d421e..c10d581260d97b8fb4d717dde75d2d54eed34cf3 100644 (file)
--- a/tests/data/test1028
+++ b/tests/data/test1028
@@ -52,12 +52,10 @@ http://%HOSTIP:%HTTPPORT/10280001 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /10280001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 USER anonymous\r

diff --git a/tests/data/test1029 b/tests/data/test1029
index c77209cad862ee14006e698d75eb8803983c39ea..9a351a4f38e498b04fd01a24255c5af29a5f9cfe 100644 (file)
--- a/tests/data/test1029
+++ b/tests/data/test1029
@@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1029 -w '%{redirect_url}\n'
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/our/1029 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1030 b/tests/data/test1030
index 5a8ed4cd62ebcd4ed0698a1d81406a68dff072d0..735c08b7ab881eafd7c832b66446aa5c39875a2c 100644 (file)
--- a/tests/data/test1030
+++ b/tests/data/test1030
@@ -79,12 +79,10 @@ four is the number of lines
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1030 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r
@@ -96,7 +94,7 @@ four is the number of lines
 PUT /1030 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1030", response="01cb59db1ddaac246b072d5f5f0716d9"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r

diff --git a/tests/data/test1031 b/tests/data/test1031
index 9cfbab5c5a14ba23eb0e2456d20e3e4bd9f010cc..b12785a0c608a4e72966e27caeac3788d4556afe 100644 (file)
--- a/tests/data/test1031
+++ b/tests/data/test1031
@@ -59,16 +59,15 @@ http://%HOSTIP:%HTTPPORT/want/this/1031 -L
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/this/1031 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/this/1031?coolsite=yes/10310002.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1032 b/tests/data/test1032
index b0b6834cc876c8fef78c12e72b52c7fc60c1c6c8..0c38ae1327e06564ea5fb61a72c0608db8c4fb2c 100644 (file)
--- a/tests/data/test1032
+++ b/tests/data/test1032
@@ -42,13 +42,11 @@ HTTP HEAD with --range
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 HEAD /1032 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=1-3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1033 b/tests/data/test1033
index 9ad5d2526c93a2d0b31c2fd96fdefca7b17e1f2b..908dd32c023eec12d99afd10e62b0bf5d131ca7d 100644 (file)
--- a/tests/data/test1033
+++ b/tests/data/test1033
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1033
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1033 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1035 b/tests/data/test1035
index 62f9d7ae89b3f633f08836fe073974fb94ec5625..b67eab281b86c010ec33d8d928c04c9055de8cef 100644 (file)
--- a/tests/data/test1035
+++ b/tests/data/test1035
@@ -42,9 +42,6 @@ http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/10
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <errorcode>
 3
 </errorcode>

diff --git a/tests/data/test1040 b/tests/data/test1040
index e21ed819923a6bad05d0ecde9bd13dcce114e7cf..d480bb4484acf669813a8ac207bf676178c5fd9c 100644 (file)
--- a/tests/data/test1040
+++ b/tests/data/test1040
@@ -65,13 +65,11 @@ http://%HOSTIP:%HTTPPORT/1040 -C -
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1040 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=100-\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1041 b/tests/data/test1041
index c77d616a826a0f98a637375082bff45efb54c329..4797cf937d99170d05140038edd8fedde3b3ec54 100644 (file)
--- a/tests/data/test1041
+++ b/tests/data/test1041
@@ -50,15 +50,13 @@ http://%HOSTIP:%HTTPPORT/1041 -Tlog/test1041.txt -C -
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 # curl doesn't do a HEAD request on the remote file so it has no idea whether
 # it can skip part of the file or not.  Instead, it sends the entire file.
 <protocol>
 PUT /1041 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 0-99/100\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 100\r
 Expect: 100-continue\r

diff --git a/tests/data/test1042 b/tests/data/test1042
index dfebaa152fe166cd3346f8addfac2bb8edeeb925..d374d2ab5e59eedf45d1531b5362bb8bf562fb48 100644 (file)
--- a/tests/data/test1042
+++ b/tests/data/test1042
@@ -80,13 +80,11 @@ http://%HOSTIP:%HTTPPORT/1042 -C 200
 <errorcode>
 33
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1042 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=200-\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1043 b/tests/data/test1043
index 4ab4987626533618a7e3973e787c474ac9e3b03f..e200b61ea37c601ab0f38af6aaf36404f10426ca 100644 (file)
--- a/tests/data/test1043
+++ b/tests/data/test1043
@@ -70,13 +70,11 @@ http://%HOSTIP:%HTTPPORT/1043 -C -
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1043 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=40-\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1045 b/tests/data/test1045
index fa8ad4b4480866d032ee60557049ea8837343922..9de169babdcd86bdb18d2a7a26cdec5b2f2e6617 100644 (file)
--- a/tests/data/test1045
+++ b/tests/data/test1045
@@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/1045 --interface %CLIENTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1045 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1046 b/tests/data/test1046
index e86e1329cb16c8501cb090bca2c4e8b548558acc..0f04b8a33433c551f53145e97be2a4a9dea9ab71 100644 (file)
--- a/tests/data/test1046
+++ b/tests/data/test1046
@@ -47,12 +47,10 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENT6IP
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1046 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1051 b/tests/data/test1051
index 080e1d1d5ab43557130e3874d0d9d12eb3f395d5..7a8eae1bd56ca3173ef653cfff66f364a18cd17a 100644 (file)
--- a/tests/data/test1051
+++ b/tests/data/test1051
@@ -73,9 +73,6 @@ the
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 
 # The primary reason libcurl sends the data part twice in this test is that
 # the test HTTP server is blocking until it has read the entire request,
@@ -85,6 +82,7 @@ the
 <protocol>
 PUT /want/1051 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 Expect: 100-continue\r
@@ -100,6 +98,7 @@ the
       feature
 PUT /want/data/10510002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 Expect: 100-continue\r

diff --git a/tests/data/test1052 b/tests/data/test1052
index 10c16b4a79cabbecf88e0c1bb88bc3db795accbb..e0c2f32a630b103212df75e7c85236213a735afc 100644 (file)
--- a/tests/data/test1052
+++ b/tests/data/test1052
@@ -69,9 +69,6 @@ the
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 
 # The primary reason libcurl sends the data part twice in this test is that
 # the test HTTP server is blocking until it has read the entire request,
@@ -80,6 +77,7 @@ the
 <protocol>
 PUT /want/1052 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 \r
@@ -94,6 +92,7 @@ the
       feature
 PUT /want/data/10520002.txt?coolsite=yes HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 \r

diff --git a/tests/data/test1053 b/tests/data/test1053
index 239a1100fded7abf2bffd5ad5cb5618935dad7cf..5f3ec2932c5096a46e36e3f647da5ab9ab1884f4 100644 (file)
--- a/tests/data/test1053
+++ b/tests/data/test1053
@@ -71,12 +71,12 @@ bar
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
 POST /we/want/1053 HTTP/1.1\r
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 410\r
 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763\r
@@ -99,8 +99,8 @@ bar
 \r
 ------------------------------9ef8d6205763--\r
 POST /we/want/data/10530002.txt?coolsite=yes HTTP/1.1\r
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 410\r
 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763\r

diff --git a/tests/data/test1054 b/tests/data/test1054
index 54d023267c07db1addf85ec565ec111f9686fa6c..ac6671f6efefdc7672966dc0ca3ce61b27dcb5cb 100644 (file)
--- a/tests/data/test1054
+++ b/tests/data/test1054
@@ -58,18 +58,17 @@ http://%HOSTIP:%HTTPPORT/blah/1054 -L -d @log/test1054.txt --post301
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /blah/1054 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 10\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 field=dataPOST /blah/moo/testcase/10540002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 10\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1055 b/tests/data/test1055
index f25db8f4260d337f239bedbe405ae5e47efcdcfd..4788ae77d91c16bae60288bc89fd2d2e79c21784 100644 (file)
--- a/tests/data/test1055
+++ b/tests/data/test1055
@@ -54,12 +54,10 @@ the
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1055 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 Expect: 100-continue\r

diff --git a/tests/data/test1056 b/tests/data/test1056
index 756d0f27f145a1785036ed468a6d79e5799cb353..7ccdb219975a1f40a92dc2d491e7a238e6807add 100644 (file)
--- a/tests/data/test1056
+++ b/tests/data/test1056
@@ -60,16 +60,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/1056 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/are/all/twits/1056 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /moo/10560002 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1058 b/tests/data/test1058
index 4eb34da738ce4933c694c35572bfd24afc222707..d177b5fd78c827c94c494b66eb458e9cf9538081 100644 (file)
--- a/tests/data/test1058
+++ b/tests/data/test1058
@@ -39,13 +39,11 @@ http://%HOSTIP:%HTTPPORT/want/1058 -r -101
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1058 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=-101\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1059 b/tests/data/test1059
index 615e625c96b0ceb3aaf0de7fc67b93dfd40e8929..32e5aec3ac11baaa1295f1a1ec0af283172c1a04 100644 (file)
--- a/tests/data/test1059
+++ b/tests/data/test1059
@@ -46,12 +46,10 @@ ftp://test-number:1059/wanted/page -p -x %HOSTIP:%HTTPPORT
 <errorcode>
 56
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 CONNECT test-number:1059 HTTP/1.1\r
 Host: test-number:1059\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>

diff --git a/tests/data/test1060 b/tests/data/test1060
index c4b264c108d4c9b5a86a9b5313623848f7fc8e3e..86fe835a91f2a82da635207ce57fa29a5b2b0284 100644 (file)
--- a/tests/data/test1060
+++ b/tests/data/test1060
@@ -881,21 +881,21 @@ http://test.remote.haxx.se.1060:8990/path/10600002 --proxy http://%HOSTIP:%HTTPP
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.1060:8990\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.1060:8990\r
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:8990", response="e1fbed39c26f4efe284adc0e576ff638"\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10600002 HTTP/1.1\r
 Host: test.remote.haxx.se.1060:8990\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1061 b/tests/data/test1061
index 6ddddfee2e8bf64ef9167be44e2cb751c3ebf65c..bfb0c6d2f1bc8a05b3175c04a8addece0ef2d9c2 100644 (file)
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -886,21 +886,21 @@ http://test.remote.haxx.se.1061:8990/path/10610002 --proxy http://%HOSTIP:%HTTPP
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.1061:8990\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.1061:8990\r
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:8990", response="4e23449fa93224834299e7282a70472c"\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /path/10610002 HTTP/1.1\r
 Host: test.remote.haxx.se.1061:8990\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1064 b/tests/data/test1064
index dd05ddf3aff5f0d5ecd4336bae1c66ae56e1e32e..3d2f4d2cbf6c1d6dec42bdddb921ede99f0bf0c7 100644 (file)
--- a/tests/data/test1064
+++ b/tests/data/test1064
@@ -44,18 +44,17 @@ test
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1064.upload1 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 5\r
 \r
 test
 PUT /10640002.upload2 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 5\r
 \r

diff --git a/tests/data/test1065 b/tests/data/test1065
index 5688ff9645672f820bf333289f0fb3585bbb0dfe..1d27ffb4b79dabcebcba9f117212777e4c1553bc 100644 (file)
--- a/tests/data/test1065
+++ b/tests/data/test1065
@@ -45,18 +45,17 @@ test
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1065.upload1 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 5\r
 \r
 test
 GET /10650002.url2 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1066 b/tests/data/test1066
index bacedefbb3de9eb2f9cd7a273be9730fddaf3944..8175af1727ac97fb183b489bf040e8090dffe70b 100644 (file)
--- a/tests/data/test1066
+++ b/tests/data/test1066
@@ -41,16 +41,15 @@ http://%HOSTIP:%HTTPPORT/want/1066 http://%HOSTIP:%HTTPPORT/want/10660001 --dump
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1066 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/10660001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1067 b/tests/data/test1067
index 9fc7a6fa468a4dc3801239c91c5d580f690662c2..4706a0a5869ca52fd7c37288ea1e41214de18643 100644 (file)
--- a/tests/data/test1067
+++ b/tests/data/test1067
@@ -59,17 +59,16 @@ http://%HOSTIP:%HTTPPORT/want/1067 -L --referer "firstone.html;auto"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1067 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Referer: firstone.html\r
 \r
 GET /want/data/10670002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Referer: http://%HOSTIP:%HTTPPORT/want/1067\r
 \r

diff --git a/tests/data/test1068 b/tests/data/test1068
index f9bfec90f1d0a6a590860ba70944dd328c6f5186..15a702d1195b8c307dda8e6f1583e11baf3ea25c 100644 (file)
--- a/tests/data/test1068
+++ b/tests/data/test1068
@@ -38,12 +38,10 @@ more than one byte
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /bzz/1068 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
 Expect: 100-continue\r

diff --git a/tests/data/test1070 b/tests/data/test1070
index 81b473de45029a926278b59b2bdcbda7d314c9ba..6056e5d936d0d595ccfbdd3f983adf888e99ec3d 100644 (file)
--- a/tests/data/test1070
+++ b/tests/data/test1070
@@ -48,12 +48,10 @@ OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /1070 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Expect: 100-continue\r
 Content-Length: 2313\r

diff --git a/tests/data/test1071 b/tests/data/test1071
index 4352e61115fcb6ede3ae0e121a3986175a71ed8e..d89b74bd0a8a844f3a275447808cb7d73e34f11d 100644 (file)
--- a/tests/data/test1071
+++ b/tests/data/test1071
@@ -85,12 +85,10 @@ four is the number of lines
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1071 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r
@@ -102,6 +100,7 @@ four is the number of lines
 PUT /1071 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1071", response="df4cef6b52a30e65d472dd848d2055a1"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 \r

diff --git a/tests/data/test1072 b/tests/data/test1072
index 14b6d804cd14bed513ad726db7dfb6f2dc5f66b1..128f0944c6119f1532575d34b271e8928358bf31 100644 (file)
--- a/tests/data/test1072
+++ b/tests/data/test1072
@@ -55,12 +55,10 @@ which is impossible in HTTP/1.0
 <errorcode>
 25
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1072 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
 Expect: 100-continue\r

diff --git a/tests/data/test1073 b/tests/data/test1073
index 481f9098fc469fd8df91cb7c270204ccdf8eccd7..80f5ec0dca4315fbabd01ce161d4baca0571d4f1 100644 (file)
--- a/tests/data/test1073
+++ b/tests/data/test1073
@@ -49,12 +49,10 @@ which is impossible in HTTP/1.0
 <errorcode>
 25
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1073 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
 Expect: 100-continue\r

diff --git a/tests/data/test1074 b/tests/data/test1074
index 3464b4183d13f5c08631ceff7e8a6c02bf91e98c..840d46195ebf6b7ef192357d5015f672c255b558 100644 (file)
--- a/tests/data/test1074
+++ b/tests/data/test1074
@@ -59,16 +59,15 @@ Connection: close
 surprise2
 </stdout>
 
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1074 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /wantmore/10740001 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1075 b/tests/data/test1075
index 4b30c593a32c11d03cfc0f158c41e7877a57cf15..f0f255ab6c5ffd53f683d0791561eb0e5556ae9a 100644 (file)
--- a/tests/data/test1075
+++ b/tests/data/test1075
@@ -64,12 +64,10 @@ four is the number of lines
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1075 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r
@@ -81,6 +79,7 @@ four is the number of lines
 PUT /1075 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r

diff --git a/tests/data/test1076 b/tests/data/test1076
index ad079eb940c04aa79b9e4b2705e7659e5ae1cf80..8322be23ae2a6e8990f7b744239e9ad22e14b012 100644 (file)
--- a/tests/data/test1076
+++ b/tests/data/test1076
@@ -56,19 +56,17 @@ http://%HOSTIP:%HTTPPORT/blah/1076 -L -d "moo" --post302
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /blah/1076 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 mooPOST /blah/moo.html&testcase=/10760002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1077 b/tests/data/test1077
index e917e8a56cf66789adcc348cd9da5ee62baba757..8b1d288dea555d34687c306b5e25d95a769002f3 100644 (file)
--- a/tests/data/test1077
+++ b/tests/data/test1077
@@ -57,17 +57,16 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1077 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1078 b/tests/data/test1078
index d705dbca4dd1d5208a866cb46578b94974e6a8cf..65c77ed7c8b4c7fc55aeea44a19f19e30fc51814 100644 (file)
--- a/tests/data/test1078
+++ b/tests/data/test1078
@@ -53,22 +53,22 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT %HOSTIP.1078:%HTTPPORT HTTP/1.0\r
 Host: %HOSTIP.1078:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /we/want/that/page/1078 HTTP/1.1\r
 Host: %HOSTIP.1078:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/want/that/page/1078 HTTP/1.0\r
 Host: %HOSTIP.1078:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1079 b/tests/data/test1079
index ac7b899fbe368a1021691b56e6fb156f6ee2dcb4..460439d5349bfdf01000b7c24981f8c9ba489a15 100644 (file)
--- a/tests/data/test1079
+++ b/tests/data/test1079
@@ -58,17 +58,16 @@ http://%HOSTIP:%HTTPPORT/1079 -u testuser:testpass --digest
 <errorcode>
 52
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1079 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1079 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1079", response="e340c7cdca0950462070f46ee139e9f7"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1080 b/tests/data/test1080
index e0f7d62ae4891c0734e6160914d5c654426bcfe3..9fa48576d49bb27197bbce4bd0bfc9e8c8f1f997 100644 (file)
--- a/tests/data/test1080
+++ b/tests/data/test1080
@@ -36,16 +36,15 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1080 http://%HOSTIP:%HTTPPORT/we/want/our/1
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/our/1080 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/want/our/1080 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1081 b/tests/data/test1081
index d9f895fd26c6c1a711030253c2ff9bb6381fd798..2a5a765e667958812f7faeffa36d7c9cee40518d 100644 (file)
--- a/tests/data/test1081
+++ b/tests/data/test1081
@@ -44,16 +44,15 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1081 http://%HOSTIP:%HTTPPORT/we/want/our/1
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/our/1081 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/want/our/10810002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1082 b/tests/data/test1082
index 8e4078b2d720f5a7e23cba6c44dc30b74c71bf4b..0df70afaeda89e783cb6d4118c3a7c0c7be37698 100644 (file)
--- a/tests/data/test1082
+++ b/tests/data/test1082
@@ -42,12 +42,10 @@ perl -e "print 'Test requires default test client host address' if ( '%CLIENTIP'
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1082 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1083 b/tests/data/test1083
index 1b1db0539969e8a5f088dc7f9ba8d001b6c7e39a..89beea0fc39cce4c9a110d640ee89293026b6df0 100644 (file)
--- a/tests/data/test1083
+++ b/tests/data/test1083
@@ -46,12 +46,10 @@ perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1083 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1087 b/tests/data/test1087
index 883d9864243ac18b988e7a694d3c21215ed55791..f674294035544bfb4cb0932ff871e33fd18c8966 100644 (file)
--- a/tests/data/test1087
+++ b/tests/data/test1087
@@ -88,23 +88,23 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1\r
 Host: first.host.it.is\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1\r
 Host: first.host.it.is\r
 Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/10871002 HTTP/1.1\r
 Host: goto.second.host.now\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1088 b/tests/data/test1088
index f2b6fc263246b6494699e29dd69591d299b6945a..649cb88eca95ecbf51515b79788e51b0914f2b71 100644 (file)
--- a/tests/data/test1088
+++ b/tests/data/test1088
@@ -89,24 +89,24 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1\r
 Host: first.host.it.is\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1\r
 Host: first.host.it.is\r
 Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/10881002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1089 b/tests/data/test1089
index d2a18a21d212b1241bc156d3bf3f4595705af51e..d4b87913687b97da6ee97cbf129e76ab19a2115a 100644 (file)
--- a/tests/data/test1089
+++ b/tests/data/test1089
@@ -50,16 +50,15 @@ http://%HOSTIP:%HTTPPORT/1089 -w "%{num_connects}\n%{num_redirects}\n%{size_down
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1089 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /10890001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1090 b/tests/data/test1090
index 3304f911d3c1bd3d034d8cf0d9dd87e5b47c0d71..9ae803fb705e6d058f73f9d2f5ca1eb11392bac8 100644 (file)
--- a/tests/data/test1090
+++ b/tests/data/test1090
@@ -57,16 +57,15 @@ http://%HOSTIP:%HTTPPORT/1090 -w "%{num_connects}\n%{num_redirects}\n%{size_down
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1090 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /10900001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1092 b/tests/data/test1092
index 725a274ba22636ed68b0c6e3457e39a307b172cd..d3ea902444d50f760b079d0338abc89839f24de0 100644 (file)
--- a/tests/data/test1092
+++ b/tests/data/test1092
@@ -43,12 +43,10 @@ FTP with type=i over HTTP proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/1092;type=i HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1095 b/tests/data/test1095
index 6bfe54f3335ac353e62e5b0db11a3c518a658c2a..3e562b0379dcfe9376b0ba96f2e394bb20090fba 100644 (file)
--- a/tests/data/test1095
+++ b/tests/data/test1095
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/1095 -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1095 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1095 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/1095", response="a1c7931ece9e8617bae2715045e4f49f"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1097 b/tests/data/test1097
index 82f23846d998b51fcfe0a342ac896a988db55b89..218d57bbecd7964283b93b0037f9d3d5e4186142 100644 (file)
--- a/tests/data/test1097
+++ b/tests/data/test1097
@@ -59,19 +59,16 @@ http://test.a.galaxy.far.far.away.1097:%HTTPPORT/1097 --proxy http://%HOSTIP:%HT
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol nonewline="yes">
 CONNECT test.a.galaxy.far.far.away.1097:%HTTPPORT HTTP/1.1\r
 Host: test.a.galaxy.far.far.away.1097:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-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\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 POST /1097 HTTP/1.1\r
-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\r
 Host: test.a.galaxy.far.far.away.1097:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1098 b/tests/data/test1098
index 0d397340c82b5729071cb73d0c00a00105bc8248..a8d25cbe29fe0534975cb30f6c533da61a64d2c9 100644 (file)
--- a/tests/data/test1098
+++ b/tests/data/test1098
@@ -43,17 +43,16 @@ ftp://ftp-site/moo/1098 ftp://ftp-site/moo/1098 --proxy http://%HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET ftp://ftp-site/moo/1098 HTTP/1.1\r
 Host: ftp-site:21\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET ftp://ftp-site/moo/1098 HTTP/1.1\r
 Host: ftp-site:21\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test11 b/tests/data/test11
index 9d93f80e0d7a8d8183e8c394622dab01eca6fef5..3eed8a17f7d0dfd79df8c833126759d2850fa17f 100644 (file)
--- a/tests/data/test11
+++ b/tests/data/test11
@@ -59,16 +59,15 @@ http://%HOSTIP:%HTTPPORT/want/11 -L
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/11 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/data/110002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1100 b/tests/data/test1100
index 101b1e7acc0dc4e5e3d672cd4b43855e0b849115..5bb807200dd2459239bf10361c9131e2a0fb3085 100644 (file)
--- a/tests/data/test1100
+++ b/tests/data/test1100
@@ -89,14 +89,10 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
-<protocol>
 POST /1100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
@@ -104,14 +100,14 @@ Content-Type: application/x-www-form-urlencoded
 POST /1100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 18\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 stuff to send awayGET /1100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.19.5-CVS (i686-pc-linux-gnu) libcurl/7.19.5-CVS GnuTLS/2.6.6 zlib/1.2.3.3 c-ares/1.6.1-CVS libidn/1.14 libssh2/1.1\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1101 b/tests/data/test1101
index 75c66195ec71df106c379fd7f0699eaba894a4b0..eaf16bd681e3e351c1b7d6bb3d42a5c98d71d5cb 100644 (file)
--- a/tests/data/test1101
+++ b/tests/data/test1101
@@ -40,13 +40,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/gimme/1101
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /gimme/1101 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1104 b/tests/data/test1104
index e66da58add16a513badac40df1e1f981235aef00..2c5b9fcf7972e95db3861ac8de37d867dadb7a33 100644 (file)
--- a/tests/data/test1104
+++ b/tests/data/test1104
@@ -68,17 +68,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/want/1104 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://%HOSTIP:%HTTPPORT/want/data/11040002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: test2=true\r

diff --git a/tests/data/test1105 b/tests/data/test1105
index 7820445837ab26e2f9cc173f62180315557439ce..8142ad2669e7fe15e9b022574153f2934fded4ce 100644 (file)
--- a/tests/data/test1105
+++ b/tests/data/test1105
@@ -41,12 +41,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /we/want/1105?parm1=this*that/other/thing&parm2=foobar/1105 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 33\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1106 b/tests/data/test1106
index 37a77e36e1c09128b02dfc223ee5d4194fbc94f0..e23c33c0458e13a85356267586c8d06afb2027ad 100644 (file)
--- a/tests/data/test1106
+++ b/tests/data/test1106
@@ -44,12 +44,10 @@ ftp://%HOSTIP:23456/1106
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET ftp://%HOSTIP:23456/1106 HTTP/1.1\r
 Host: %HOSTIP:23456\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1109 b/tests/data/test1109
index b68b5a22f42358144246b2acafeee346560723e0..e504ce9da1c3a2549aa9537dd93d9718dc3e5868 100644 (file)
--- a/tests/data/test1109
+++ b/tests/data/test1109
@@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1109#test
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1109 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1110 b/tests/data/test1110
index 94cfe9105472c87e65f486b6968acbf130cdf5c8..50bd4d20cfe9b17720ad70b80c2020d9f8f11e9e 100644 (file)
--- a/tests/data/test1110
+++ b/tests/data/test1110
@@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/1110?q=foobar#fragment
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1110?q=foobar HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1111 b/tests/data/test1111
index d9db12c7f850fae84752f163fb904396ef193343..1ba21bffd055e0280bff21e61bcd655f3217bbfb 100644 (file)
--- a/tests/data/test1111
+++ b/tests/data/test1111
@@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/1111?q=foobar#fragment#fragment2
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1111?q=foobar HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1115 b/tests/data/test1115
index f9d6e364564552a4942b56200d713e24bc33b150..0b1f034ee6bae1acc03d59e2c31e341bcef9b0bc 100644 (file)
--- a/tests/data/test1115
+++ b/tests/data/test1115
@@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/1115
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1115 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1116 b/tests/data/test1116
index b72cbd60ed9df3efbefa8812f24bf3814852d854..ce5305d79c678a7eb3fa2ec2a3bfe40b1a302488 100644 (file)
--- a/tests/data/test1116
+++ b/tests/data/test1116
@@ -56,12 +56,10 @@ http://%HOSTIP:%HTTPPORT/1116 -D log/heads1116
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1116 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1117 b/tests/data/test1117
index 963f1efecc650b06abf6e4a413dd7de6e613345e..79c9fd4bb5aec0b31ee85c6607a83718809ab488 100644 (file)
--- a/tests/data/test1117
+++ b/tests/data/test1117
@@ -68,18 +68,17 @@ Content-Type: text/plain
 partial body
 </stdout>
 
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1117 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=10-22\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /wantmore/11170001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=10-22\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1118 b/tests/data/test1118
index bc776aff6c79d9afc4c9f9cdffe2722093f86480..702b2dfe8e2351f5a6596be2ae4833900970640c 100644 (file)
--- a/tests/data/test1118
+++ b/tests/data/test1118
@@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT?email=name@example.com/1118
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /?email=name@example.com/1118 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1121 b/tests/data/test1121
index 405066ff62d4c4870a2bed1453751b962e7cc237..839c553645882dcdb2fb8364a89456a78b10138b 100644 (file)
--- a/tests/data/test1121
+++ b/tests/data/test1121
@@ -34,12 +34,10 @@ HTTP multiple provided Host: headers
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1121 HTTP/1.1\r
 Host: host1\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1122 b/tests/data/test1122
index 78d50d77bd6d556f8f2e777dbafe78bd8564bfcb..d5b51a2cf4540a03f4ebce85161d7af50e90fb70 100644 (file)
--- a/tests/data/test1122
+++ b/tests/data/test1122
@@ -55,12 +55,10 @@ http://%HOSTIP:%HTTPPORT/1122 --tr-encoding
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1122 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Connection: TE\r
 TE: gzip\r

diff --git a/tests/data/test1123 b/tests/data/test1123
index bd441a995f74fb8542f551d253a089978c945fda..841a326adda343d8588c38b9ffee7c0b267e4d88 100644 (file)
--- a/tests/data/test1123
+++ b/tests/data/test1123
@@ -186,12 +186,10 @@ http://%HOSTIP:%HTTPPORT/1123 --tr-encoding
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1123 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Connection: TE\r
 TE: gzip\r

diff --git a/tests/data/test1124 b/tests/data/test1124
index 58f63f9307910b03988879371f3a6cfdd736c306..61c5cfb6c4ae675b81d493e55f6f407a66ce8b75 100644 (file)
--- a/tests/data/test1124
+++ b/tests/data/test1124
@@ -54,12 +54,10 @@ http://%HOSTIP:%HTTPPORT/1124 --tr-encoding
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1124 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Connection: TE\r
 TE: gzip\r

diff --git a/tests/data/test1125 b/tests/data/test1125
index 1883734d9bbb49c88ea0987b37dfb93ec3c74297..51e3db78324edb974685eab1a3f6e2f635963f40 100644 (file)
--- a/tests/data/test1125
+++ b/tests/data/test1125
@@ -55,12 +55,10 @@ http://%HOSTIP:%HTTPPORT/1125 --tr-encoding -H "Connection: close"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1125 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Connection: close, TE\r
 TE: gzip\r

diff --git a/tests/data/test1126 b/tests/data/test1126
index 52f4db411ade302e95533439fca4f499bd6cc7dc..4f99072c0a1f50a05a12adc4b1067f81104e1e0b 100644 (file)
--- a/tests/data/test1126
+++ b/tests/data/test1126
@@ -38,12 +38,10 @@ http://%HOSTIP:%HTTPPORT/1126 -z "dec 12 12:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1126 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
 \r

diff --git a/tests/data/test1127 b/tests/data/test1127
index 3cc42c26a82310ff24194be467ec1dd35abdc95d..e1453a601041a608f2eaccfad4cfbad0d2ff7729 100644 (file)
--- a/tests/data/test1127
+++ b/tests/data/test1127
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1127 -z "dec 12 12:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1127 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
 \r

diff --git a/tests/data/test1128 b/tests/data/test1128
index a20487b434827be68fff1b93ee88bfaab71eeebc..a18f487ec9476d8cac009d3dc17caa914bf67208 100644 (file)
--- a/tests/data/test1128
+++ b/tests/data/test1128
@@ -48,17 +48,16 @@ http://%HOSTIP:%HTTPPORT/1128 http://%HOSTIP:%HTTPPORT/11280001 -z "dec 12 12:00
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1128 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
 \r
 GET /11280001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
 \r

diff --git a/tests/data/test1129 b/tests/data/test1129
index cc52367336c45b842037b5521023633c1aaa33ed..449b247d7b072872b3755b83a1720c1a656290b7 100644 (file)
--- a/tests/data/test1129
+++ b/tests/data/test1129
@@ -74,12 +74,10 @@ Content-Type: text/html
 
 -foo-
 </stdout>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /1129 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 1053700\r
 Content-Type: application/x-www-form-urlencoded\r
@@ -87,6 +85,7 @@ Expect: 100-continue
 \r
 POST /11290001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 1053700\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1130 b/tests/data/test1130
index eb1e59f5bdd3c9832141462a5a9ac24275137503..01836cd713700116709ee1398b726036b76eb0c8 100644 (file)
--- a/tests/data/test1130
+++ b/tests/data/test1130
@@ -74,12 +74,10 @@ Content-Type: text/html
 
 -foo-
 </stdout>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /1130 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Expect: 100-continue\r
 Content-Length: 100\r
@@ -87,6 +85,7 @@ Content-Type: application/x-www-form-urlencoded
 \r
 POST /11300001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Expect: 100-continue\r
 Content-Length: 100\r

diff --git a/tests/data/test1131 b/tests/data/test1131
index 96843af540f9b06e4e8d095aee822da4c994dae0..64df118f7185fcb4b426a83cd0a66aff6429b1e7 100644 (file)
--- a/tests/data/test1131
+++ b/tests/data/test1131
@@ -74,18 +74,17 @@ Content-Type: text/html
 
 FAILURE2
 </stdout>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1131 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 100\r
 Expect: 100-continue\r
 \r
 PUT /11310001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 100\r
 Expect: 100-continue\r

diff --git a/tests/data/test1133 b/tests/data/test1133
index 738e806143d53f6bd54c1a65cfae87b7abb9511f..555bafcdd3568722d64c7b217e1d256fc3a9e585 100644 (file)
--- a/tests/data/test1133
+++ b/tests/data/test1133
@@ -40,12 +40,12 @@ foo
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).*
+^(Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).*
 </strip>
 <protocol>
 POST /we/want/1133 HTTP/1.1\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 1264\r
 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32\r

diff --git a/tests/data/test1134 b/tests/data/test1134
index e290b5369680ded661fcb640a195922623d812b0..52aafcce19f3c6e5f5e70fc97088c2f02c76225b 100644 (file)
--- a/tests/data/test1134
+++ b/tests/data/test1134
@@ -45,18 +45,17 @@ http://%HOSTIP:%HTTPPORT/1134 -u user1:password1 --next http://%HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1134 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjE6cGFzc3dvcmQx\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /11340001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic MnVzZXI6cGFzc3dvcmQy\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 [DISCONNECT]

diff --git a/tests/data/test1138 b/tests/data/test1138
index 0c91d204d2c0aa61cceb5407bdd25d034ee3ab97..a69d40fd2994bce3d513eb8834bc29e89eba5e1e 100644 (file)
--- a/tests/data/test1138
+++ b/tests/data/test1138
@@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/1138 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/are/all/twits/1138 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/are/all/moo.html/?name=%d8%a2%d8%ba%d8%a7%d8%b2-%d8%b3%d9%85-%d8%b2%d8%af%d8%a7%db%8c%db%8c-%d8%a7%d8%b2-%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1-%d9%be%d9%88%d9%84&testcase=/11380002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1141 b/tests/data/test1141
index b0cff8e3712af19d8dfdd80fba5cc134a7fac5a6..063d3b28426248184a888f407101cb3f5584c6f8 100644 (file)
--- a/tests/data/test1141
+++ b/tests/data/test1141
@@ -54,17 +54,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/want/1141 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://foo.example.com/want/11410001 HTTP/1.1\r
 Host: foo.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1142 b/tests/data/test1142
index 5f1e2b35ad33db7ca31dd288a847288ba379ff9d..3577ac46856dd9ebf047b7c4367145cd72f36562 100644 (file)
--- a/tests/data/test1142
+++ b/tests/data/test1142
@@ -49,12 +49,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/want/1142 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1143 b/tests/data/test1143
index 7776cfa877175fcfdb015408064c580ea151c669..8239c444ff762e0229f74c17af9be41e549f889e 100644 (file)
--- a/tests/data/test1143
+++ b/tests/data/test1143
@@ -37,12 +37,10 @@ MSYS2_ARG_CONV_EXCL=http:/
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1143 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1144 b/tests/data/test1144
index 84c22dba24f304cedf88df6115a1ac480a1d9f36..5883555690f5f08d810011b7d2ab3e56b9bdd645 100644 (file)
--- a/tests/data/test1144
+++ b/tests/data/test1144
@@ -54,12 +54,10 @@ HTTP HEAD, receive no headers only body
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 HEAD /1144 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1148 b/tests/data/test1148
index c4232f083a926ca18e981141731de78b4c13f9bf..a4839e27c4269c30627cc4d8e0db7f5f390376e2 100644 (file)
--- a/tests/data/test1148
+++ b/tests/data/test1148
@@ -45,12 +45,10 @@ LC_NUMERIC=en_US.UTF-8
 
 #
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1148 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1150 b/tests/data/test1150
index e86c7e15494b33533ef1323adafd67f4b37eac8c..f951f570ebd4f811f5eea74378a03b36fcf320f5 100644 (file)
--- a/tests/data/test1150
+++ b/tests/data/test1150
@@ -39,17 +39,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://test.remote.example.com.1150:150/path HTTP/1.1\r
 Host: test.remote.example.com.1150:150\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.example.com.1150:1234/path/ HTTP/1.1\r
 Host: test.remote.example.com.1150:1234\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1151 b/tests/data/test1151
index d793944c3c1f69a7e43e5dd2a4870db21181bc50..e3abcbe998926c73e51c17d2e1287f0fdb82f31c 100644 (file)
--- a/tests/data/test1151
+++ b/tests/data/test1151
@@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/1151 -c log/cookies1151.txt
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1151 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1154 b/tests/data/test1154
index 3582eb99a88f5c107ee68a302b50f6828e363177..d2bde8d5f2e2ab59039a4ecc452028356eaa61ea 100644 (file)
--- a/tests/data/test1154
+++ b/tests/data/test1154
@@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/1154
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1154 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1155 b/tests/data/test1155
index 3db824d58a8c72fdc83a2346b36d2db0ed4e4203..90d33bd71cce635a5417c3669284c7b7c1c157ee 100644 (file)
--- a/tests/data/test1155
+++ b/tests/data/test1155
@@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/1155 -c log/cookies1155.txt
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1155 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1157 b/tests/data/test1157
index b0bbf244fd937f4faf144fe94a9223cff2692ef7..baf12edb4f3e8f2272dd1c13272deb4f9b13feca 100644 (file)
--- a/tests/data/test1157
+++ b/tests/data/test1157
@@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1157 -H @log/heads1157.txt
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1157 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1158 b/tests/data/test1158
index 62adc579d1ff7f7b03e0bf1f5c18714197c9802d..f2b40e01ba4b0822664d271f4a670e8fad843d2f 100644 (file)
--- a/tests/data/test1158
+++ b/tests/data/test1158
@@ -43,12 +43,12 @@ foo
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).*
+^(Content-Type: multipart/form-data;|Content-Type: multipart/mixed; boundary=|-------).*
 </strip>
 <protocol>
 POST /we/want/1158 HTTP/1.1\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 954\r
 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32\r

diff --git a/tests/data/test1159 b/tests/data/test1159
index a51601659e0384b4369c1dd0b1644b92187d0669..ea07f238f4842fbff2aabfa759a7eb3703a2700b 100644 (file)
--- a/tests/data/test1159
+++ b/tests/data/test1159
@@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1159 -w '%{redirect_url}\n'
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/our/1159 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1160 b/tests/data/test1160
index 63dd0a7a0dcaf9f34f76bfbe5bc600b185e8cdb5..cc864b3d161f01d702b3c6259767353b1b27ed07 100644 (file)
--- a/tests/data/test1160
+++ b/tests/data/test1160
@@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/1160 -c log/cookies1160.txt
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1160 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1161 b/tests/data/test1161
index ee6f1d04adb4030cadc88bc0498fabcac632e5dd..f7b610e3e989000de6816dd01477bdef60645fc2 100644 (file)
--- a/tests/data/test1161
+++ b/tests/data/test1161
@@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/1161 -c log/cookies1161.txt
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1161 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1164 b/tests/data/test1164
index a5ce6d11a79ce2340a013855f699941478b557cc..f62b0f66ec6ff086a58213af7ac8218e12145193 100644 (file)
--- a/tests/data/test1164
+++ b/tests/data/test1164
@@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/1164 -w '%{size_download}\n' --http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1164 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1166 b/tests/data/test1166
index 3cae80ecda15079b7a5b19ce7382e4b8ea04fd75..292d09fc3185f17df58c69c99faf43b8db92bd0b 100644 (file)
--- a/tests/data/test1166
+++ b/tests/data/test1166
@@ -36,16 +36,15 @@ http://%HOSTIP:%HTTPPORT/want/1166 http://%HOSTIP:%HTTPPORT/want/1166
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1166 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/1166 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1168 b/tests/data/test1168
index 283e91e01974a3e2ab4020e8a9adcce58403bdee..b2f08fb6196cf2d2f15fee6805a4bf52e01b4884 100644 (file)
--- a/tests/data/test1168
+++ b/tests/data/test1168
@@ -59,18 +59,17 @@ http://%HOSTIP:%HTTPPORT/want/1168 -L -u "catmai#d:#DZaRJYrixKE*gFY"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/1168 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /data/11680002.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1170 b/tests/data/test1170
index a4d9eb84bab8984b1c30412c6d81063ba5209520..39ff3c8c9e2e59b00ba623477bc2e0aafd4a5791 100644 (file)
--- a/tests/data/test1170
+++ b/tests/data/test1170
@@ -55,12 +55,10 @@ http://%HOSTIP:%HTTPPORT/1170 --tr-encoding -H "Connection:"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1170 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Connection: TE\r
 TE: gzip\r

diff --git a/tests/data/test1171 b/tests/data/test1171
index 0f7ee90d3355a6ecd2d4f3ba6ad137add66b33ab..bc98d312e1634a9f0531ac8df96a21cdff9502ea 100644 (file)
--- a/tests/data/test1171
+++ b/tests/data/test1171
@@ -55,12 +55,10 @@ http://%HOSTIP:%HTTPPORT/1171 --tr-encoding -H "Connection;"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1171 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Connection: TE\r
 TE: gzip\r

diff --git a/tests/data/test1172 b/tests/data/test1172
index 6e61720bd51cb2b3bb21f9d2d052bb6f92119970..a099057f2c10b591b8a88776be44483ffb4db8fe 100644 (file)
--- a/tests/data/test1172
+++ b/tests/data/test1172
@@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1172 --no-http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1172 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1174 b/tests/data/test1174
index b316fde8cfcfd61095f4083e42e33480ed1a96f3..7768696ffd8bb52992d694b378de605e9f2b30b7 100644 (file)
--- a/tests/data/test1174
+++ b/tests/data/test1174
@@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1174
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1174 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1176 b/tests/data/test1176
index 491bee16f0a42b212962faef6fff96d6549fa0ff..ce992e341b0bfb1db823dfe4d66cb8e9079a8bce 100644 (file)
--- a/tests/data/test1176
+++ b/tests/data/test1176
@@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/1176 -o 'log/base-#0'
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1176 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1178 b/tests/data/test1178
index 6d1264c358c0a7e222b5009f2e11018b006d319b..91ef78c8fff59a7a7b2ba068f4f346c5b4baa1ce 100644 (file)
--- a/tests/data/test1178
+++ b/tests/data/test1178
@@ -40,13 +40,11 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/we/want/that/page/1178 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1197 b/tests/data/test1197
index 96d368f8b2af1d881ca32e5226b9d2cba2c96c1a..1abd9aeb570784a2128685b28659f71140d0326f 100644 (file)
--- a/tests/data/test1197
+++ b/tests/data/test1197
@@ -50,18 +50,17 @@ http://%HOSTIP:%HTTPPORT/1197 -w "%{method}\n" -L -d "twinkle twinkle little sta
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /1197 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 27\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 twinkle twinkle little starGET /11970001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test12 b/tests/data/test12
index 06dbdf56fb4f3d91025ad33f13c0c6e4b642e947..8f93abbaaa15d5650286267c499fcf49168c9e69 100644 (file)
--- a/tests/data/test12
+++ b/tests/data/test12
@@ -42,13 +42,11 @@ http://%HOSTIP:%HTTPPORT/want/12 -r 100-200
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/12 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=100-200\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1204 b/tests/data/test1204
index d2f06b68e57688a520a8a498b1bf851d4a46992c..50738011c42b26f241c0850f8c71e0ab5a67a313 100644 (file)
--- a/tests/data/test1204
+++ b/tests/data/test1204
@@ -61,17 +61,16 @@ http://%HOSTIP:%HTTPPORT/1204 -u testuser:testpass --anyauth
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1204 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1204 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1205 b/tests/data/test1205
index 7e4a882c70f4d8873a2abf806fa2d6357bd807b8..8509d3fd5572c54f2b66d56e96eb04ea76903ea0 100644 (file)
--- a/tests/data/test1205
+++ b/tests/data/test1205
@@ -37,12 +37,10 @@ http://%HOSTIP:%HTTPPORT/1205
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1205 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1210 b/tests/data/test1210
index df931988cef09010af4412f642640ca31896de78..71053f2183047abc0867c22bcb3fcf857396742e 100644 (file)
--- a/tests/data/test1210
+++ b/tests/data/test1210
@@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/1210 -J -O
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1210 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1212 b/tests/data/test1212
index a50601f78811c912b791be6a509bb8e09331bb9d..7c2af2e548523efd7f24c6e1ef192046bd79b023 100644 (file)
--- a/tests/data/test1212
+++ b/tests/data/test1212
@@ -37,13 +37,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/ulion/1212 --socks5 non-existing-host.haxx.
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /ulion/1212 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1213 b/tests/data/test1213
index 46a6938cb3554ca5f24bf7868224a7182a2cf4f6..54a8f2d99e5456b1ba11f2bbed714fe40d6cf3c6 100644 (file)
--- a/tests/data/test1213
+++ b/tests/data/test1213
@@ -42,12 +42,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://we.want.that.site.com.1213/ HTTP/1.1\r
 Host: we.want.that.site.com.1213\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1214 b/tests/data/test1214
index 73c799a4afce07883d2d54c2104d7ba88d2db9bd..985fd383b669fd2f03bad52384cb7f7bf91c93ea 100644 (file)
--- a/tests/data/test1214
+++ b/tests/data/test1214
@@ -42,12 +42,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://we.want.that.site.com.1214/?moo=foo HTTP/1.1\r
 Host: we.want.that.site.com.1214\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1215 b/tests/data/test1215
index ed50da0b80d15a4a9b3999bc2645b7ded6e6e9de..7aa1c4237c743dbe363bb147382f1601ddbe0571 100644 (file)
--- a/tests/data/test1215
+++ b/tests/data/test1215
@@ -85,21 +85,18 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.30.0-DEV\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.30.0-DEV\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1216 b/tests/data/test1216
index c4f977b6040598c0daf6d15283c42fd2a3d5cc59..62271332358f755462fa3eb21ff624e137bbbd37 100644 (file)
--- a/tests/data/test1216
+++ b/tests/data/test1216
@@ -46,18 +46,17 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://example.fake/c/1216 HTTP/1.1\r
 Host: example.fake\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: moo3=indeed; moo2=indeed\r
 \r
 GET http://bexample.fake/c/1216 HTTP/1.1\r
 Host: bexample.fake\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1218 b/tests/data/test1218
index 37c8f4ef0256e4fa30df25468cb0512c2ecf6b13..b9914d25fd6ae003dff45367dc37b2a54fbecf42 100644 (file)
--- a/tests/data/test1218
+++ b/tests/data/test1218
@@ -39,23 +39,23 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://example.fake/c/1218 HTTP/1.1\r
 Host: example.fake\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://example.fake/c/1218 HTTP/1.1\r
 Host: example.fake\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: bug=fixed\r
 \r
 GET http://bexample.fake/c/1218 HTTP/1.1\r
 Host: bexample.fake\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1223 b/tests/data/test1223
index 2885bc59ab7294a96eecfb7e95c99b0a2b4358a7..f448f5c146489a8417b8d3e39a7d101dedb3c60c 100644 (file)
--- a/tests/data/test1223
+++ b/tests/data/test1223
@@ -37,12 +37,10 @@ http://%HOSTIP:%HTTPPORT/1223 -w 'IP %{remote_ip} and PORT %{remote_port}\n'
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1223 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1228 b/tests/data/test1228
index 50af6bc2c990b3c069c25b568e5e7ea1477d05ad..529c7e55d0506edfc9b9c0a2737b6dab85c27da1 100644 (file)
--- a/tests/data/test1228
+++ b/tests/data/test1228
@@ -38,17 +38,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://example.fake/hoge/1228 HTTP/1.1\r
 Host: example.fake\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://example.fake/hogege/ HTTP/1.1\r
 Host: example.fake\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: path1=root\r

diff --git a/tests/data/test1229 b/tests/data/test1229
index 225ba3cc43c0c84f1cbcbcd8fce99e7587799a11..0cb45358a89917823a48337a69ee4cd10267bc23 100644 (file)
--- a/tests/data/test1229
+++ b/tests/data/test1229
@@ -65,17 +65,16 @@ http://%5cuser%22:password@%HOSTIP:%HTTPPORT/1229 --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1229 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1229 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/1229", response="f2694d426040712584c156d3de72b8d6"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1230 b/tests/data/test1230
index 860ce21a45c7bf7e0ab657abcc098f76ceb0088d..a439b17ed110c8c70c3ac7d50a141de67ffc3e09 100644 (file)
--- a/tests/data/test1230
+++ b/tests/data/test1230
@@ -62,16 +62,15 @@ http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/1230 -p -x %HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 CONNECT [1234:1234:1234::4ce]:%HTTPPORT HTTP/1.1\r
 Host: [1234:1234:1234::4ce]:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /wanted/page/1230 HTTP/1.1\r
 Host: [1234:1234:1234::4ce]:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1231 b/tests/data/test1231
index 61998d1c39adaee2f9636b10a38e0d5bef0f1ee2..7b085c52390e5727459bbaa73f5d88af711883a9 100644 (file)
--- a/tests/data/test1231
+++ b/tests/data/test1231
@@ -44,16 +44,15 @@ http://%HOSTIP:%HTTPPORT/../../hej/but/who/../1231?stupid=me/../1231#soo/../1231
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /hej/but/1231?stupid=me/../1231 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /hej/but/12310001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1232 b/tests/data/test1232
index 7425d44d88ebbd77423759028559c23f11e75b60..7a74cb12d2bc8ba1ec95ccf85e425a41f6d6fe67 100644 (file)
--- a/tests/data/test1232
+++ b/tests/data/test1232
@@ -49,17 +49,16 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://test.remote.haxx.se.1232:8990/hej/but/1232?stupid=me/../1232 HTTP/1.1\r
 Host: test.remote.haxx.se.1232:8990\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.haxx.se.1232:8990/hej/but/12320001 HTTP/1.1\r
 Host: test.remote.haxx.se.1232:8990\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1235 b/tests/data/test1235
index 9e51219ffab47e4d6570d1514ff8f50e0737688d..3fffb42090f96a23686da7d1b14755da20956331 100644 (file)
--- a/tests/data/test1235
+++ b/tests/data/test1235
@@ -40,28 +40,25 @@ multiple requests using {}{} in the URL
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /12350001 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /12350002 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /12350001 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /12350002 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1237 b/tests/data/test1237
index 21da17dcfecb1e597d59e1e26db42ba5d44f01c7..a016e5fb6d72c18d026684faac02f44f2c5b2cdc 100644 (file)
--- a/tests/data/test1237
+++ b/tests/data/test1237
@@ -33,13 +33,11 @@ URL with 1000+ letter user name + password
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1237 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1239 b/tests/data/test1239
index b3503d9c4e27ab46dd83d85b52ed1ca951f58927..375d92b68431a86feb8006d262638f06afac6472 100644 (file)
--- a/tests/data/test1239
+++ b/tests/data/test1239
@@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/1239 -z "-dec 12 12:00:00 1999 GMT" -w '%{response_code
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1239 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Unmodified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
 \r

diff --git a/tests/data/test1240 b/tests/data/test1240
index 6435950585d6b3b7fa4f53fd5bbaac9be7cc43c7..44ce1f69ba0b338733822b1e5516d5e26d5f5fe7 100644 (file)
--- a/tests/data/test1240
+++ b/tests/data/test1240
@@ -31,16 +31,15 @@ glob [0-1] with stuff after range (7.33.0 regression)
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /00/1240 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /01/1240 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1241 b/tests/data/test1241
index bc6c61801a6fc5e4a04289597bedafe104925941..0089828f86243a72535d5d9722d84fcc6434c381 100644 (file)
--- a/tests/data/test1241
+++ b/tests/data/test1241
@@ -48,17 +48,16 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../1241?stupid=me/../1241 HTTP/1.1\r
 Host: test.remote.haxx.se.1241:8990\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001 HTTP/1.1\r
 Host: test.remote.haxx.se.1241:8990\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1244 b/tests/data/test1244
index 0912c0947301a2b17e29bdc0e88d14c287345253..c2ac4a4d14e7381fb18664a1a6140cf3a2e6c7bd 100644 (file)
--- a/tests/data/test1244
+++ b/tests/data/test1244
@@ -50,12 +50,10 @@ http://%HOSTIP:%HTTPPORT/1244 -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:%HTTPPO
 <errorcode>
 56
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/1244 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1245 b/tests/data/test1245
index 8924bff972b792e7c23da8f555b0cff0cb8d628d..d60ff2bc1dea07827b327b8a1362538fcc497303 100644 (file)
--- a/tests/data/test1245
+++ b/tests/data/test1245
@@ -42,12 +42,10 @@ ftp
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1245 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1246 b/tests/data/test1246
index a35bc89c37831a5f62b1c22f8c7398f967684f21..bc3d2b000233699576093a1ca0f2506a8bab88b1 100644 (file)
--- a/tests/data/test1246
+++ b/tests/data/test1246
@@ -48,17 +48,16 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://test.remote.haxx.se.1246:%HTTPPORT/ HTTP/1.1\r
 Host: test.remote.haxx.se.1246:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://no-scheme-url.com.1246:%HTTPPORT/ HTTP/1.1\r
 Host: no-scheme-url.com.1246:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1248 b/tests/data/test1248
index 02dacfc8b9f6bf8227ecd0f53f9ced8838af4445..7410483b8b9c3dc26c2c02e84ad8919013f3d9b2 100644 (file)
--- a/tests/data/test1248
+++ b/tests/data/test1248
@@ -35,13 +35,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/1248 --proxy http://dummy:%NOLISTENPORT/ --
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1248 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1249 b/tests/data/test1249
index 1bc3cfe593c5e53a72a04abc051f15e03d350bf1..13a14630a4eeab35320bdfe65d1ff8e811e078ad 100644 (file)
--- a/tests/data/test1249
+++ b/tests/data/test1249
@@ -38,13 +38,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/1249 --proxy http://dummy:%NOLISTENPORT/ --
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1249 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1250 b/tests/data/test1250
index bf67b7fe7c75c92abd34984e86a5dc63dce4130c..acd670e505f4641fdd265e6a2c0ea0c8f8d3c325 100644 (file)
--- a/tests/data/test1250
+++ b/tests/data/test1250
@@ -39,13 +39,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/1250 --noproxy %HOSTIP --max-time 5
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1250 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1251 b/tests/data/test1251
index f37a685e8db636abb71558f2830317b73e17c887..f5cf5130349dd2edc15728535afa8065f6c0bd6e 100644 (file)
--- a/tests/data/test1251
+++ b/tests/data/test1251
@@ -40,13 +40,11 @@ http://user:secret@%HOSTIP:%HTTPPORT/1251 --max-time 5
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1251 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpzZWNyZXQ=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1252 b/tests/data/test1252
index cbaef48b732fef890cb5174c5639a6e679604e45..e68fcb9186757711dba26bcecfe40e8ded992195 100644 (file)
--- a/tests/data/test1252
+++ b/tests/data/test1252
@@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/1252 --proxy http://%HOSTIP:%HTTPPORT --noproxy %HOSTIP
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1252 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1253 b/tests/data/test1253
index 8f240b0af304edf928c2b8e8cd9f25e4147afd42..7ad1f86f2dfd3f6f3c4323a33780b488035b2fd8 100644 (file)
--- a/tests/data/test1253
+++ b/tests/data/test1253
@@ -42,12 +42,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://somewhere.example.com/1253 HTTP/1.1\r
 Host: somewhere.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1254 b/tests/data/test1254
index c05975488c818273cb05932ccb9574b051dcbe7c..b2f27f94e89228fd0d0a6951594dc8dab10e6513 100644 (file)
--- a/tests/data/test1254
+++ b/tests/data/test1254
@@ -42,12 +42,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://somewhere.example.com/1254 HTTP/1.1\r
 Host: somewhere.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1255 b/tests/data/test1255
index d82310f67b6f8ad31c70fd3e01ceffff19229b76..9148a56ce832481979bcd50897636456cc5d831b 100644 (file)
--- a/tests/data/test1255
+++ b/tests/data/test1255
@@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/1255 --noproxy %HOSTIP
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1255 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1256 b/tests/data/test1256
index e86afbb53f60d2848676c95f17eaeb8c47250936..1ba0a0983b9330729aa0412e032330c744f3d042 100644 (file)
--- a/tests/data/test1256
+++ b/tests/data/test1256
@@ -43,12 +43,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://somewhere.example.com/1256 HTTP/1.1\r
 Host: somewhere.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1257 b/tests/data/test1257
index 16a7c1af603b9d9c6743d16bd2b49eb4fbd7a70e..b05c524ba38711f3a5949da873b437ae413f7d3c 100644 (file)
--- a/tests/data/test1257
+++ b/tests/data/test1257
@@ -43,12 +43,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://somewhere.example.com/1257 HTTP/1.1\r
 Host: somewhere.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1258 b/tests/data/test1258
index 6fa88e16e5109564c4521bdd6f18e225a38c8fd4..297460c85e3da66370e2bd18ae9e9d3aacfeebfb 100644 (file)
--- a/tests/data/test1258
+++ b/tests/data/test1258
@@ -36,16 +36,15 @@ http://%HOSTIP:%HTTPPORT/we/want/1258 http://%HOSTIP:%HTTPPORT/we/want?hoge=fuga
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/1258 HTTP/1.1\r
 Host: localhost\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/want?hoge=fuga HTTP/1.1\r
 Host: localhost\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: I-am=here\r
 \r

diff --git a/tests/data/test1259 b/tests/data/test1259
index bad4ee25e29f96059df3d68fb381b34c62240a19..0bfa71cdccb70003b3cc12238267c289e2da8df7 100644 (file)
--- a/tests/data/test1259
+++ b/tests/data/test1259
@@ -33,13 +33,11 @@ HTTP URL with semicolon in password
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/1259 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcjpwYXNzO3dvcmQ=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1261 b/tests/data/test1261
index 7f887994e6e8c9f3e45b19d7f8ed4fe1e87c8bdb..ef3cded578d1d83f5acf436b1c99337a28393d9a 100644 (file)
--- a/tests/data/test1261
+++ b/tests/data/test1261
@@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1261 -w '%{redirect_url}\n' --location --ma
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/our/1261 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1265 b/tests/data/test1265
index 5d3ef6dc8a512823313bb24b5c51206147586858..12d524319d2f268f102a5cde9d84392d59609654 100644 (file)
--- a/tests/data/test1265
+++ b/tests/data/test1265
@@ -40,12 +40,10 @@ http://%HOST6IP:%HTTP6PORT/1265
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1265 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1266 b/tests/data/test1266
index cab11efa085a01ca150c600ba171a95322cd0f8c..1de936e03279b135c1417c6e59d147d00f88becb 100644 (file)
--- a/tests/data/test1266
+++ b/tests/data/test1266
@@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1266 --http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1266 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1267 b/tests/data/test1267
index 82d37445d41ecf68db429a5d226500dd57a65185..06500e87b3435491b66a0cf749ac31ff7ecde99c 100644 (file)
--- a/tests/data/test1267
+++ b/tests/data/test1267
@@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/1267 --http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1267 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1270 b/tests/data/test1270
index 25799818af331339cc09c1604c93e4c9c8a5f9d5..680e1e47c66f1a20306926b4eb6400d01aa919bb 100644 (file)
--- a/tests/data/test1270
+++ b/tests/data/test1270
@@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1270 -w '%{redirect_url}\n' -s
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/our/1270 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1271 b/tests/data/test1271
index 687a6a979beefe3373093abe275541391d3baf86..ce89c38f2fbb5ab1f85a20a9695ba2647e5ffe83 100644 (file)
--- a/tests/data/test1271
+++ b/tests/data/test1271
@@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/we/want/our/1271 -w @log/blank1271
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/our/1271 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1280 b/tests/data/test1280
index 15c1e2fd1b27309aa1032082389bb6165bbb945d..0b7bc00455c76b1e80a5a441cc74ba8543c5ac32 100644 (file)
--- a/tests/data/test1280
+++ b/tests/data/test1280
@@ -33,24 +33,25 @@ http://%HOSTIP:%HTTPPORT/[a-d]/1280
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /a/1280 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /b/1280 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /c/1280 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /d/1280 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1283 b/tests/data/test1283
index ac275e92e59e5df6cacee15037b5fa55a0b41f3b..d4c0ad964a72aedc621b403b996512b3f4c4b727 100644 (file)
--- a/tests/data/test1283
+++ b/tests/data/test1283
@@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/1283 -o "log/outfile1283_#1#2#
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /a1b2/1283 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1284 b/tests/data/test1284
index 8437a408257da20fc61ff00e9e38f26757ad41c5..4509a9b91397360ee8d6536f70491b8890acef4e 100644 (file)
--- a/tests/data/test1284
+++ b/tests/data/test1284
@@ -66,12 +66,10 @@ HTTP POST --digest with user-specified Content-Length header
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /1284 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
@@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded
 POST /1284 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1284", response="5763079608de439072861a59ac733515"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1285 b/tests/data/test1285
index 16c66238ac4cbfb63f08da21cac6c8fa08671648..62828ba4f719ddb9f2cd9c364a657b482f566959 100644 (file)
--- a/tests/data/test1285
+++ b/tests/data/test1285
@@ -72,18 +72,17 @@ four is the number of lines
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1285 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 \r
 PUT /1285 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1285", response="dc185587d5e8391b347eef194c2a3cd6"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r

diff --git a/tests/data/test1286 b/tests/data/test1286
index 41782cb0f9bf8835b0769bcbb668b4b13a548056..c64a79b47a8808494e38614757b0efa576c79be9 100644 (file)
--- a/tests/data/test1286
+++ b/tests/data/test1286
@@ -77,9 +77,7 @@ HTTP GET --digest increasing nonce-count
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
+
 # Reorder the fields in 'Authorization: Digest' header.
 # Since regular and SSPI digest auth header fields may not have the same order
 # or whitespace we homogenize so that both may be tested. Also:
@@ -93,16 +91,19 @@ if(s/^(Authorization: Digest )([^\r\n]+)(\r?\n)$//) { $_ = $1 . join(', ', map {
 <protocol>
 GET /1286 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1286 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/1286", username="auser"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /12860001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/12860001", username="auser"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1287 b/tests/data/test1287
index 976fd6ecfe63ffdba9517dd05ec397eb3efde3dd..d53a72b8e1aa05392bb8642ef1cf05dd9cce000b 100644 (file)
--- a/tests/data/test1287
+++ b/tests/data/test1287
@@ -68,18 +68,17 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT test.1287:%HTTPPORT HTTP/1.1\r
 Host: test.1287:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /we/want/that/page/1287 HTTP/1.1\r
 Host: test.1287:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1288 b/tests/data/test1288
index d8a1e524cd2135248d7282687b1ab9bd23e13d16..a841709beeffb0e00be4f27f9f7d1408e4add1e8 100644 (file)
--- a/tests/data/test1288
+++ b/tests/data/test1288
@@ -52,18 +52,17 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT %HOSTIP.1288:%HTTPPORT HTTP/1.1\r
 Host: %HOSTIP.1288:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /we/want/that/page/1288 HTTP/1.1\r
 Host: %HOSTIP.1288:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1290 b/tests/data/test1290
index e556303bf137d29b7f864043a435d7b0b8118a6f..871dcd763c825703b94a6a333d2975284b63550d 100644 (file)
--- a/tests/data/test1290
+++ b/tests/data/test1290
@@ -35,12 +35,10 @@ Verify URL globbing ignores []
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/[]/page/1290 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1292 b/tests/data/test1292
index 880a4b465517572856f66ef1fd4d3008f251851b..dee0def3eb70a337c190657f5b460bbaaaf6bd7e 100644 (file)
--- a/tests/data/test1292
+++ b/tests/data/test1292
@@ -37,12 +37,10 @@ Replaced internal headers with a blank one
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1292 HTTP/1.1\r
 Host:\r
+User-Agent: curl/%VERSION\r
 Accept:\r
 \r
 </protocol>

diff --git a/tests/data/test1293 b/tests/data/test1293
index e2143d1033da6ff42c526a850169551144ca106b..df72b755a40cefb17c719b570706e29cbecfab15 100644 (file)
--- a/tests/data/test1293
+++ b/tests/data/test1293
@@ -43,9 +43,6 @@ http://0 http://%HOSTIP:%HTTPPORT/1293 -F=
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
@@ -53,6 +50,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
 <protocol>
 POST /1293 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 126\r
 Content-Type: multipart/form-data; boundary=----------------------------\r

diff --git a/tests/data/test1294 b/tests/data/test1294
index 1c2c0ef95a94e3d9fe0546e6ba537d31fe8e58f2..4fa1cb1d9d202f496192048e8bf6ce3bec1f7512 100644 (file)
--- a/tests/data/test1294
+++ b/tests/data/test1294
@@ -51,12 +51,10 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1294 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Among other public buildings in a certain town, which for many reasons it will be prudent to refrain from mentioning, and to which I will assign no fictitious name, there is one anciently common to most towns, great or small to wit, a workhouse; and in this workhouse was born; on a day and date which I need not trouble myself to repeat, inasmuch as it can be of no possible consequence to the reader, in this stage of the business at all events; the item of mortality whose name is prefixed to the head of this chapter: 511\r
 \r

diff --git a/tests/data/test1295 b/tests/data/test1295
index b929e3c6d4d4c56815b52ef55ed4fe3418ca0be3..50e5fa2e2a90594a873fa0b8e09fbd0358b8db9c 100644 (file)
--- a/tests/data/test1295
+++ b/tests/data/test1295
@@ -51,12 +51,10 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/1295 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300\r
 Content-Length: 165\r

diff --git a/tests/data/test1296 b/tests/data/test1296
index 386eb18fc5e6f4f71a2a870d24b058fc88df5a98..55b01c4c41cd32e7b6b32e8b5983966fcd00282f 100644 (file)
--- a/tests/data/test1296
+++ b/tests/data/test1296
@@ -41,13 +41,11 @@ http://user%0aname:password@%HOSTIP:%HTTPPORT/1296
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1296 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dXNlcgpuYW1lOnBhc3N3b3Jk\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1297 b/tests/data/test1297
index 56a62a81c727e4e5325258924f5c70b28f790250..6cffff85dd48b54c7c4f4f895c501e7f880366a4 100644 (file)
--- a/tests/data/test1297
+++ b/tests/data/test1297
@@ -43,18 +43,17 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT %HOSTIP.1297:%HTTPPORT HTTP/1.1\r
 Host: %HOSTIP.1297:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /we/want/that/page/1297 HTTP/1.1\r
 Host: %HOSTIP.1297:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1298 b/tests/data/test1298
index 061a4e1e004c78cf2a3b6a98bb114f6d6850b601..6a34aa32ba43ec0f7a2673e677219aa125a47cc5 100644 (file)
--- a/tests/data/test1298
+++ b/tests/data/test1298
@@ -42,12 +42,10 @@ HTTP GET special path with --request-target
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET XXX HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Testno: 1298\r
 \r

diff --git a/tests/data/test1299 b/tests/data/test1299
index 51e0e79831d8dcb5fa331f5148a1bd2a59905535..2cf293a413cf47ab65614b7056810629f415941b 100644 (file)
--- a/tests/data/test1299
+++ b/tests/data/test1299
@@ -41,12 +41,10 @@ Send "OPTIONS *" with --request-target
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 OPTIONS * HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Testno: 1299\r
 \r

diff --git a/tests/data/test13 b/tests/data/test13
index 18f7f8114957b9213f32e64c640f36d2907a0dbb..1216979475bd90d9df111045fcb91c2ebc7969e4 100644 (file)
--- a/tests/data/test13
+++ b/tests/data/test13
@@ -31,12 +31,10 @@ http://%HOSTIP:%HTTPPORT/want/13 -X DELETE
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 DELETE /want/13 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1310 b/tests/data/test1310
index 9ffe0d58614fa9ee8318b6f8edaa571dacc11430..cb9db82814bc7b6280e544bfbbe6aab73b2b8191 100644 (file)
--- a/tests/data/test1310
+++ b/tests/data/test1310
@@ -86,20 +86,17 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1310 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAA\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1310 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAE8AAAAYABgAZwAAAAAAAABAAAAACAAIAEAAAAAHAAcASAAAAAAAAAAAAAAAggEAAHRlc3R1c2VyVU5LTk9XTlpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOQ==\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1311 b/tests/data/test1311
index e47647c38b75284236af6d1cc96422b7c1524fcc..4078d7bb411094e18a1be63ebb0c33374f44f38e 100644 (file)
--- a/tests/data/test1311
+++ b/tests/data/test1311
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1311 -J -O
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1311 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1312 b/tests/data/test1312
index bed492c16d705c4d7f110e9deca6626d33fc49ee..54659b55bd8312bfa695febcea52a9d19117a0c0 100644 (file)
--- a/tests/data/test1312
+++ b/tests/data/test1312
@@ -47,12 +47,10 @@ CURL_TESTDIR=%PWD/log
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1312 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1313 b/tests/data/test1313
index 2331ae9ee03251b46daa01550662e3f3be3cfb41..3d9c0940d35d379d561274c16c04a4a4c7674bf7 100644 (file)
--- a/tests/data/test1313
+++ b/tests/data/test1313
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1313 -J -O
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1313 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1314 b/tests/data/test1314
index 3963bd93f4367de0d9ef594fc5d5312c94906b0c..55e3299e461bf0cf3e3e3e04637d7bbcab24c2e0 100644 (file)
--- a/tests/data/test1314
+++ b/tests/data/test1314
@@ -63,17 +63,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://firstplace.example.com/want/1314 HTTP/1.1\r
 Host: firstplace.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://somewhere.example.com/reply/1314 HTTP/1.1\r
 Host: somewhere.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1315 b/tests/data/test1315
index 888ddc5c100c785fe33ef588cd6765d04c862bab..ffc7bdc7bd0ec34019cab3250c8abfad5acfe2e2 100644 (file)
--- a/tests/data/test1315
+++ b/tests/data/test1315
@@ -40,12 +40,12 @@ dummy data
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-(^User-Agent:.*|-----+\w+)
+-----+\w+
 </strip>
 <protocol>
 POST /we/want/1315 HTTP/1.1\r
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 797\r
 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763\r

diff --git a/tests/data/test1317 b/tests/data/test1317
index d41886a5f6436e213485f7f8f2400c9f77b3fbd6..7964b10bdbed2f3ecd86b748211185563998d4a3 100644 (file)
--- a/tests/data/test1317
+++ b/tests/data/test1317
@@ -43,12 +43,10 @@ HTTP with --resolve
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1317 HTTP/1.1\r
 Host: example.com:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1318 b/tests/data/test1318
index dc182dccb80293f9f13e23a515abe843cee2de1a..8ce468db17047f093a20d88be328cf64814062f3 100644 (file)
--- a/tests/data/test1318
+++ b/tests/data/test1318
@@ -43,16 +43,15 @@ HTTP with --resolve and same host name using different cases
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1318 HTTP/1.1\r
 Host: MiXeDcAsE.cOm:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /13180001 HTTP/1.1\r
 Host: mixedcase.com:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1319 b/tests/data/test1319
index 8fc968c890f583f16867df2c2d684536cc57a233..b37a97055ae7baaf04bda7efc73e8c36c9f8e28c 100644 (file)
--- a/tests/data/test1319
+++ b/tests/data/test1319
@@ -63,9 +63,6 @@ pop3://pop.1319:%POP3PORT/1319 -p -x %HOSTIP:%PROXYPORT -u user:secret
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:
-</strip>
 <protocol>
 CAPA\r
 USER user\r
@@ -76,7 +73,7 @@ QUIT
 <proxy>
 CONNECT pop.1319:%POP3PORT HTTP/1.1\r
 Host: pop.1319:%POP3PORT\r
-User-Agent: curl/7.24.0-DEV (i686-pc-linux-gnu) libcurl/7.24.0-DEV OpenSSL/1.0.0e zlib/1.2.3.4 c-ares/1.7.6-DEV libidn/1.23 libssh2/1.4.0_DEV librtmp/2.2e\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>

diff --git a/tests/data/test1320 b/tests/data/test1320
index da4079e939c6d52603229d6a5f50b852a9a72136..2db0e3dee2b14406a4c1c87cf9ea96cc52a734d4 100644 (file)
--- a/tests/data/test1320
+++ b/tests/data/test1320
@@ -46,9 +46,6 @@ smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt recipient@example.com --mail-from se
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 EHLO 1320\r
 MAIL FROM:<sender@example.com>\r
@@ -66,7 +63,7 @@ body
 <proxy>
 CONNECT smtp.1320:%SMTPPORT HTTP/1.1\r
 Host: smtp.1320:%SMTPPORT\r
-User-Agent: curl/7.24.0-DEV (i686-pc-linux-gnu) libcurl/7.24.0-DEV OpenSSL/1.0.0e zlib/1.2.3.4 c-ares/1.7.6-DEV libidn/1.23 libssh2/1.4.0_DEV librtmp/2.2e\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>

diff --git a/tests/data/test1321 b/tests/data/test1321
index cc9117774d88e71106fcdb22fadef72c0fe60ab4..4607797846ceb585ca393d182e829eebacbffaf3 100644 (file)
--- a/tests/data/test1321
+++ b/tests/data/test1321
@@ -59,9 +59,6 @@ IMAP FETCH tunneled through HTTP proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 A001 CAPABILITY\r
 A002 LOGIN user secret\r
@@ -72,7 +69,7 @@ A005 LOGOUT
 <proxy>
 CONNECT imap.1321:%IMAPPORT HTTP/1.1\r
 Host: imap.1321:%IMAPPORT\r
-User-Agent: curl/7.24.0-DEV (i686-pc-linux-gnu) libcurl/7.24.0-DEV OpenSSL/1.0.0e zlib/1.2.3.4 c-ares/1.7.6-DEV libidn/1.23 libssh2/1.4.0_DEV librtmp/2.2e\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>

diff --git a/tests/data/test1322 b/tests/data/test1322
index 974989517b7bb27bb2890fb1ba5fbc47e38e7d01..71b8cb20e59eda6127970c280c529b7837c0e139 100644 (file)
--- a/tests/data/test1322
+++ b/tests/data/test1322
@@ -44,12 +44,10 @@ HTTP with --resolve and hostname with trailing dot
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1322 HTTP/1.1\r
 Host: example.com:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1324 b/tests/data/test1324
index d7e663a0fba61e622e8c15e229dfce86e2e9ea50..0c89edbd1b20e0bd023d92e14239724c76e0c888 100644 (file)
--- a/tests/data/test1324
+++ b/tests/data/test1324
@@ -43,12 +43,10 @@ HTTP with --resolve and [ipv6address]
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1324 HTTP/1.1\r
 Host: example.com:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1325 b/tests/data/test1325
index 6da1cbc6a3132be342de49a9618ccbd8c7332a50..bbf679df4f334ec3a56b4236851688590f3e1cf8 100644 (file)
--- a/tests/data/test1325
+++ b/tests/data/test1325
@@ -58,18 +58,17 @@ http://%HOSTIP:%HTTPPORT/we/1325 -L -d "moo"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /we/1325 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 mooPOST /we/13250002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1328 b/tests/data/test1328
index 06088884aeaf211a1eea253d0796be8480d04ef4..0fd0c38de8f08285f9d3a7c43ed9b320ca23f6ec 100644 (file)
--- a/tests/data/test1328
+++ b/tests/data/test1328
@@ -54,16 +54,15 @@ HTTP GET a globbed range with -f
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /13280000 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /13280001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1331 b/tests/data/test1331
index 865abd9699a06183f2e741c196622fe3081541b8..09aabf879aee8217ac51dee03f36211bb0b9221e 100644 (file)
--- a/tests/data/test1331
+++ b/tests/data/test1331
@@ -71,18 +71,17 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://z.x.com/1331 HTTP/1.1\r
 Host: z.x.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://z.x.com/1331 HTTP/1.1\r
 Host: z.x.com\r
 Proxy-Authorization: Basic bXluYW1lOm15cGFzc3dvcmQ=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: proxycookie=weirdo\r

diff --git a/tests/data/test1332 b/tests/data/test1332
index 3447b2dddac56f796430ca6135a482ac4774b1ab..3271b5701c8cb5c566655476ffe77e7e173457be 100644 (file)
--- a/tests/data/test1332
+++ b/tests/data/test1332
@@ -57,19 +57,17 @@ http://%HOSTIP:%HTTPPORT/blah/1332 -L -d "moo" --post303
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /blah/1332 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 mooPOST /blah/moo.html&testcase=/13320002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1333 b/tests/data/test1333
index 50ca42a29ad89d2dcc018a6efa04c2cc94f02642..3ef8ed49fce58c97b92748c2ef3845be00994b5c 100644 (file)
--- a/tests/data/test1333
+++ b/tests/data/test1333
@@ -38,12 +38,10 @@ HTTP POST zero length, chunked-encoded
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /1333 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1334 b/tests/data/test1334
index 59116e38822ad205d41f38dc0d18aad11b31040a..0885357fc10e757ca300264126a9a203f7a00083 100644 (file)
--- a/tests/data/test1334
+++ b/tests/data/test1334
@@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1334 -O -D log/heads1334
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1334 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1335 b/tests/data/test1335
index bb499e73f3d3efe8757714c2c27251b126c81e08..9cf1f3ef4f2ffb0f288e59a303407dcdf51efcb3 100644 (file)
--- a/tests/data/test1335
+++ b/tests/data/test1335
@@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1335 -O -D -
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1335 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1336 b/tests/data/test1336
index ebe562b6a5a6c4c72d1709f1344f0c0da06d8328..f6fcb94311dc5f270fd1062cd424c9362d7384b1 100644 (file)
--- a/tests/data/test1336
+++ b/tests/data/test1336
@@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1336
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1336 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1337 b/tests/data/test1337
index 80a99facfeaffba08e5b47af27f34c09b1f666da..d7f556cd31724cc4b27a06d238c7d563673bf76f 100644 (file)
--- a/tests/data/test1337
+++ b/tests/data/test1337
@@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1337
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1337 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1338 b/tests/data/test1338
index d96f80467b02c4097e8908ddd0f7a17ff7fd9af2..8941a64a4ce67b4477effdbd73cf1c8fac3958aa 100644 (file)
--- a/tests/data/test1338
+++ b/tests/data/test1338
@@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/1338 -J -O -D log/heads1338
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1338 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1339 b/tests/data/test1339
index a3c1f0e54a1ab520523016658d6ab364d0c19c2f..f08e87cdf2f3c0f5f4bfa8807c90b24c585cef24 100644 (file)
--- a/tests/data/test1339
+++ b/tests/data/test1339
@@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/1339 -J -O -D -
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1339 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1340 b/tests/data/test1340
index 644fb2b51662d27c46cd8955fdb0fc2027c04203..c2e065db2dbe2a3c6a9bdd1bb4bcc3ed89d3381b 100644 (file)
--- a/tests/data/test1340
+++ b/tests/data/test1340
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1340 -J -O -D log/heads1340 -w "curl: Saved to filename
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1340 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1341 b/tests/data/test1341
index ae226744c91ec7782ee37909520bb581c83666c7..060fc093de92017e9bb55eab0c99105719941ff2 100644 (file)
--- a/tests/data/test1341
+++ b/tests/data/test1341
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1341 -J -O -D - -w "curl: Saved to filename %{filename_
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1341 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1342 b/tests/data/test1342
index 1d7889d1ebfeba9c8a2ad1e195c85473d06ac709..012b63437e5ce335cb6ddc864dcf2f0754ebae15 100644 (file)
--- a/tests/data/test1342
+++ b/tests/data/test1342
@@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1342 -i -O -D log/heads1342
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1342 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1343 b/tests/data/test1343
index a05cab04cd72f34917fca43065c948ead017a773..636afab2422b99fd830702ef3e4a56b0d549fbb6 100644 (file)
--- a/tests/data/test1343
+++ b/tests/data/test1343
@@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1343 -i -O -D -
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1343 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1344 b/tests/data/test1344
index ac354f0dd417ef9934c8532c6f0ad60d369aec72..4d8bd4affc84260b28b0c6cae5cafee5513c24dc 100644 (file)
--- a/tests/data/test1344
+++ b/tests/data/test1344
@@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1344
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1344 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1345 b/tests/data/test1345
index 6d1201e16176c9405ad242fca528a701ed40d18b..f69a56adf734f91e8b2a3344022d5d328f963454 100644 (file)
--- a/tests/data/test1345
+++ b/tests/data/test1345
@@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1345
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1345 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1346 b/tests/data/test1346
index 347214e697b67df9a471ec45481e8473f4f83c61..83cdaa8c4ba479277d5a78a42d3a7a0f7ad81e9f 100644 (file)
--- a/tests/data/test1346
+++ b/tests/data/test1346
@@ -45,12 +45,10 @@ http://%HOSTIP:%HTTPPORT/1346 -i -O
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1346 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1347 b/tests/data/test1347
index 8eac42cb2b8a5f7e6610e412f81018a7f661074a..f16abcd027f6e8ae835f468825673100c34002aa 100644 (file)
--- a/tests/data/test1347
+++ b/tests/data/test1347
@@ -49,12 +49,10 @@ perl %SRCDIR/libtest/notexists.pl log/name1347
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1347 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1364 b/tests/data/test1364
index e8c981d779a9fad80a6256046810461ffe86a121..777d9b2485c71218625e2e6c30ee3285468f7287 100644 (file)
--- a/tests/data/test1364
+++ b/tests/data/test1364
@@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1364
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1364 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1365 b/tests/data/test1365
index 4a09cfd6ab1b87fb2a6a6f31ee67098a84f1566c..c69ee4b7cacbc7290579721d6a2c02ea56435920 100644 (file)
--- a/tests/data/test1365
+++ b/tests/data/test1365
@@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1365
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1365 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1366 b/tests/data/test1366
index 62e3b0c42f4b12c8c79ad866a8093d6c3fde4989..c87455fc0fe5c781d70652e5ec4c4494bb31a656 100644 (file)
--- a/tests/data/test1366
+++ b/tests/data/test1366
@@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1366 log/name1366
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1366 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1367 b/tests/data/test1367
index d4bd3d777bc31d497dc7c3b1e9b1b0f84851b235..68bc33363c77bce75c01c54d9d25da0c23bb2908 100644 (file)
--- a/tests/data/test1367
+++ b/tests/data/test1367
@@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1367 log/name1367
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1367 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1368 b/tests/data/test1368
index 6a926ab68fcab20219a627d5cf99d604cea0a757..37805176b1450f035fef9f9bafce53514393a86f 100644 (file)
--- a/tests/data/test1368
+++ b/tests/data/test1368
@@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1368
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1368 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1369 b/tests/data/test1369
index 5176ed0b03e5a8c3af3be16604471ea295b9c3d7..1a59446333c5008cd7e056e22b03586864709ae6 100644 (file)
--- a/tests/data/test1369
+++ b/tests/data/test1369
@@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1369
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1369 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1370 b/tests/data/test1370
index d0abbdd68989136fda24f2e5dc5acab093fb00a1..ec5e7b54c99f3b5d0c6c47256aa93295a94e51ee 100644 (file)
--- a/tests/data/test1370
+++ b/tests/data/test1370
@@ -42,12 +42,10 @@ perl %SRCDIR/libtest/notexists.pl log/1370 log/name1370
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1370 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1371 b/tests/data/test1371
index fe3977fae6f85cdfb597c974037bfaf8bbb99395..d3e187adc43781029d66a0d6c2511b327d8b4d86 100644 (file)
--- a/tests/data/test1371
+++ b/tests/data/test1371
@@ -42,12 +42,10 @@ perl %SRCDIR/libtest/notexists.pl log/1371 log/name1371
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1371 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1372 b/tests/data/test1372
index a2b8ec9619ca2d3701584318bfd0d8a450135d78..49c89f96f884f0d97e453a3ae47b263a10efdecf 100644 (file)
--- a/tests/data/test1372
+++ b/tests/data/test1372
@@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1372
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1372 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1373 b/tests/data/test1373
index ae906d7bd91c801aef1df3744a5ddec8590365bf..3ceaacaf9ba1ccd813ab70a8107dae9d7f4a3013 100644 (file)
--- a/tests/data/test1373
+++ b/tests/data/test1373
@@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1373
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1373 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1374 b/tests/data/test1374
index f8d9d0dd051883bd4d4a449710659efd3aa83b63..e143b41db9c20295107229bdaf7005719ab2a786 100644 (file)
--- a/tests/data/test1374
+++ b/tests/data/test1374
@@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1374 log/name1374
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1374 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1375 b/tests/data/test1375
index 595f03ac134f1e5bff570f3de2f149d0ee7ac21e..f6219a1ea5cabfc43dd11d1abdd09a9c3449a993 100644 (file)
--- a/tests/data/test1375
+++ b/tests/data/test1375
@@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1375 log/name1375
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1375 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1376 b/tests/data/test1376
index f34c2774506904f7125687b21c486592a0e50167..1d12c4c6a564cf6678f8fc2e21b9b4f3aa63ef75 100644 (file)
--- a/tests/data/test1376
+++ b/tests/data/test1376
@@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1376
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1376 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1377 b/tests/data/test1377
index f542b11c77692261993a1c5a995d87cdf98790b5..f24561654efe984ddd96996917357b539356ed77 100644 (file)
--- a/tests/data/test1377
+++ b/tests/data/test1377
@@ -41,12 +41,10 @@ perl %SRCDIR/libtest/notexists.pl log/1377 log/name1377
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1377 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test14 b/tests/data/test14
index 21a4865b4569a7d3c5311d968972405e86003deb..f6c568ede4e1d7e86e62f120a36d8ed5b8fb75f6 100644 (file)
--- a/tests/data/test14
+++ b/tests/data/test14
@@ -30,13 +30,10 @@ http://%HOSTIP:%HTTPPORT/want/14 -i --head
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 HEAD /want/14 HTTP/1.1\r
-User-Agent: curl/7.4.2-pre4 (sparc-sun-solaris2.7) libcurl 7.4.2-pre4\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1400 b/tests/data/test1400
index c0d409bac03a32b10824c56393f22fc5b392e818..eea8d3fbe103766e0668b018f44d8f2590ecc63d 100644 (file)
--- a/tests/data/test1400
+++ b/tests/data/test1400
@@ -37,13 +37,10 @@ http://%HOSTIP:%HTTPPORT/we/want/1400 --libcurl log/test1400.c
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/1400 HTTP/1.1\r
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1401 b/tests/data/test1401
index ec3b25cc954f74e01a61aa048249f648b6cec5bb..b20607c310ecd8eb3cef3caf355b6955f6033425 100644 (file)
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -41,14 +41,11 @@ http://%HOSTIP:%HTTPPORT/we/want/1401 --libcurl log/test1401.c --basic -u fake:u
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/1401 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: stripped\r
 Authorization: Basic ZmFrZTp1c2Vy\r
+User-Agent: MyUA\r
 Accept: */*\r
 Cookie: chocolate=chip\r
 X-Files: Mulder\r

diff --git a/tests/data/test1402 b/tests/data/test1402
index bf7eb7b828bc2053cceee3a8688a41b8371e282d..29655479057dc33d8c1c14c57b1f366c39111208 100644 (file)
--- a/tests/data/test1402
+++ b/tests/data/test1402
@@ -38,13 +38,10 @@ http://%HOSTIP:%HTTPPORT/we/want/1402 --libcurl log/test1402.c -d "foo=bar" -d "
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /we/want/1402 HTTP/1.1\r
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 16\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1403 b/tests/data/test1403
index 731d274b39830f9565312442dc6ac40a00f3cdaa..6d21ce85e0e8edb7b5265d24e3de7920ff81d34a 100644 (file)
--- a/tests/data/test1403
+++ b/tests/data/test1403
@@ -38,13 +38,10 @@ http://%HOSTIP:%HTTPPORT/we/want/1403 --libcurl log/test1403.c -G -d "foo=bar" -
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/1403?foo=bar&baz=quux HTTP/1.1\r
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1404 b/tests/data/test1404
index d3c66a9d57ac03e9af60dd1c2a47013651c27c7e..8f61ec00fb320badeadb9fcdd3feb7552353118a 100644 (file)
--- a/tests/data/test1404
+++ b/tests/data/test1404
@@ -44,12 +44,12 @@ dummy data
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-(^User-Agent:.*|-----+\w+)
+-----+\w+
 </strip>
 <protocol>
 POST /we/want/1404 HTTP/1.1\r
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 882\r
 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763\r

diff --git a/tests/data/test1408 b/tests/data/test1408
index bf775ed39867c41d1c58bc2a8a0b9a054acd701d..6d3131fb685bc6044ce3691c0c0092dba6750436 100644 (file)
--- a/tests/data/test1408
+++ b/tests/data/test1408
@@ -55,16 +55,15 @@ HTTP receive cookies over IPV6
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /path/14080001 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /path/14080002 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: time=1\r
 \r

diff --git a/tests/data/test1411 b/tests/data/test1411
index 3ffd586de9bb16e6458b8c72c07a0535ddb3abe2..93e3b4b8b1d468fbe8544cd1a8ae585ccb0b3988 100644 (file)
--- a/tests/data/test1411
+++ b/tests/data/test1411
@@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/1411 -T log/empty1411
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /1411 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 \r

diff --git a/tests/data/test1412 b/tests/data/test1412
index 36d3d1d93bb796c20487fd7378c85186f060b617..808ed17f2f3bf94248843efd26b121d5bca3abc2 100644 (file)
--- a/tests/data/test1412
+++ b/tests/data/test1412
@@ -106,29 +106,27 @@ four is the number of lines
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1412 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1412 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1412", response="0390dbe89e31adca0413d11f91f30e7f"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /14120001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /14120001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/14120001", response="0085df91870374c8bf4e94415e7fbf8e"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1413 b/tests/data/test1413
index 6e889a8a203dea6736f82147b1d5fc3e037c3973..96467f169f382853df6300f77df91b677eb98d8e 100644 (file)
--- a/tests/data/test1413
+++ b/tests/data/test1413
@@ -56,16 +56,15 @@ http://%HOSTIP:%HTTPPORT/this/1413 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /this/1413 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /this/moo.html/14130002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1415 b/tests/data/test1415
index 94ce02c59846a1db6bef9053fd58e21310e2a7c0..7c9e389f9525dc7b5da698eabfcf3079c08601d0 100644 (file)
--- a/tests/data/test1415
+++ b/tests/data/test1415
@@ -53,12 +53,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://example.com/we/want/1415 HTTP/1.1\r
 Host: example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1416 b/tests/data/test1416
index 546575e5db1239d98ce03db59d2c1f449e45f140..f6e9bbfe4c9152e50a82ea9e68e89d3689fa9f23 100644 (file)
--- a/tests/data/test1416
+++ b/tests/data/test1416
@@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/1416
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1416 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1417 b/tests/data/test1417
index 4d3971ea8eeb5c16b8e3eb23e949c461e2b6715d..a141b11d26ce7a2d4e5b2aaf7ca657120074a536 100644 (file)
--- a/tests/data/test1417
+++ b/tests/data/test1417
@@ -56,12 +56,10 @@ http://%HOSTIP:%HTTPPORT/1417 -D log/heads1417
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1417 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1418 b/tests/data/test1418
index c137b1c590b71fe25ef5537dc0a51f8619765615..51d2e5f0af64c62abbefeb228c3925ea2ead9a31 100644 (file)
--- a/tests/data/test1418
+++ b/tests/data/test1418
@@ -93,26 +93,27 @@ http://%HOSTIP:%HTTPPORT/1418 -u testuser:testpass --anyauth http://%HOSTIP:%HTT
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1418 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1418 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/1418", response="986238b7e0077754944c966f56d9bc77"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /14180003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /14180003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/14180003", response="1c6390a67bac3283a9b023402f3b3540"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 [DISCONNECT]

diff --git a/tests/data/test1419 b/tests/data/test1419
index f29ce4444e8dd11a58645fc1f3173c1589c528b4..6d05f0b5a09f5bfb129856de7d453410393e837c 100644 (file)
--- a/tests/data/test1419
+++ b/tests/data/test1419
@@ -51,16 +51,15 @@ http://%HOSTIP:%HTTPPORT/1419 --anyauth http://%HOSTIP:%HTTPPORT/14190003
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1419 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /14190003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 [DISCONNECT]

diff --git a/tests/data/test1421 b/tests/data/test1421
index dea49e781927d2f5b2be996db7150cccb130484e..c219770e3e5a5080cc93bee879b6c4475d3fb003 100644 (file)
--- a/tests/data/test1421
+++ b/tests/data/test1421
@@ -55,17 +55,16 @@ Content-Length: 6
 
 -foo-
 </stdout>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://test.remote.haxx.se.1421:8990/ HTTP/1.1\r
 Host: test.remote.haxx.se.1421:8990\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://different.remote.haxx.se.1421:8990/ HTTP/1.1\r
 Host: different.remote.haxx.se.1421:8990\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1422 b/tests/data/test1422
index cbb2d63bc451fc54ef05b788aaddc3f18a1ebba6..4108091f412fbfb830ea80f9931f3f7c29cc9844 100644 (file)
--- a/tests/data/test1422
+++ b/tests/data/test1422
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/1422 -J -O file://%PWD/log/name1422
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1422 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1423 b/tests/data/test1423
index 908ff8c29ca06ecd4e554e171557ad2ac79ccb82..b0fcef3ba3e573b503a43597771e921556b79ec8 100644 (file)
--- a/tests/data/test1423
+++ b/tests/data/test1423
@@ -40,12 +40,10 @@ perl %SRCDIR/libtest/notexists.pl log/1423
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1423 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1424 b/tests/data/test1424
index 17bc46a1d229038e0e531856e6a27944daed0adb..8f922e620b4559f3e22938bed92268f12155cb7a 100644 (file)
--- a/tests/data/test1424
+++ b/tests/data/test1424
@@ -57,12 +57,10 @@ http://%HOSTIP:%HTTPPORT/1424 -z "dec 12 11:00:00 1999 GMT" -o log/outfile1424
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1424 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT\r
 \r

diff --git a/tests/data/test1425 b/tests/data/test1425
index ce9ba97fb353c22bd5527edc98d878faba4ae96a..7122cd6371f1f33ab2409ceb39fab6aeaa36183a 100644 (file)
Binary files a/tests/data/test1425 and b/tests/data/test1425 differ

diff --git a/tests/data/test1426 b/tests/data/test1426
index 851d8c3fb432d6cfab44fc9a97c8dfd2d075fbdf..1344b8ebd3e19186caf8d47aab37c6e0913f4d82 100644 (file)
Binary files a/tests/data/test1426 and b/tests/data/test1426 differ

diff --git a/tests/data/test1428 b/tests/data/test1428
index f09c02dd953d22f365762939927a7433bdc7bf7c..0ff74d4beb6fa52e9e65213cde39b2584877c36f 100644 (file)
--- a/tests/data/test1428
+++ b/tests/data/test1428
@@ -60,13 +60,10 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT test.1428:%HTTPPORT HTTP/1.1\r
 Host: test.1428:%HTTPPORT\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
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 header-type: proxy\r
 \r
@@ -75,7 +72,7 @@ header-type: proxy
 GET /we/want/that/page/1428 HTTP/1.1\r
 Host: test.1428:%HTTPPORT\r
 Authorization: Basic aWFtOm15OjtzZWxm\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
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 header-type: server\r
 \r

diff --git a/tests/data/test1429 b/tests/data/test1429
index b6a66c75f879ce751ab67305ca9b25e0e936af26..4f3989cf56353646dfe52776e14a0d4847ddca53 100644 (file)
--- a/tests/data/test1429
+++ b/tests/data/test1429
@@ -57,12 +57,10 @@ Funny-head: yesyes
 -foo-
 234
 </stdout>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1429 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1430 b/tests/data/test1430
index e3c9b1d607451675fc687b699d8434de1f0e7a00..5acc7f12e51fd5872b4bd52ef050ebf71a89d873 100644 (file)
--- a/tests/data/test1430
+++ b/tests/data/test1430
@@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/1430
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1430 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1431 b/tests/data/test1431
index bec3ebbde7d4248030a7ae7541a18838f3a95198..58500879c12dba548ac2e8f2caa412124dca17d2 100644 (file)
--- a/tests/data/test1431
+++ b/tests/data/test1431
@@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/1431
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1431 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1432 b/tests/data/test1432
index 7f41c65be57a77675db30491557eead423ee7116..fadbe83851e299cf39b8b273eddad1d8c7060d32 100644 (file)
--- a/tests/data/test1432
+++ b/tests/data/test1432
@@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/1432
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1432 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1433 b/tests/data/test1433
index a159daff3a12ed99203f9abc4a64086010baad40..6656114d5b1b443deb1b6af80723344739ed3732 100644 (file)
--- a/tests/data/test1433
+++ b/tests/data/test1433
@@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/1433
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1433 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1434 b/tests/data/test1434
index 0b33bb958cdbb03f6576ac4f15230b9bb07f669d..55031be71e907cf577e3df8e0b640bbff8659480 100644 (file)
--- a/tests/data/test1434
+++ b/tests/data/test1434
@@ -76,13 +76,11 @@ http://%HOSTIP:%HTTPPORT/1434 -C 100
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1434 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=100-\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1435 b/tests/data/test1435
index bd171a4531f5ac509f0a9346c3bf4a46cb1a9f4b..73262498e2ce770b49089b82aae04a3b3a3d486a 100644 (file)
--- a/tests/data/test1435
+++ b/tests/data/test1435
@@ -33,12 +33,10 @@ simple HTTP GET over Unix socket
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1435 HTTP/1.1\r
 Host: server-interpreted.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1436 b/tests/data/test1436
index e40a3bf4beaa1b7e56ac7a31544a86d5fe758eaa..040b3b389967f09a256eeec5c273f40b8bb8dbe1 100644 (file)
--- a/tests/data/test1436
+++ b/tests/data/test1436
@@ -47,20 +47,20 @@ HTTP requests with multiple connections over Unix socket
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /14360001 HTTP/1.1\r
 Host: one.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /14360002 HTTP/1.1\r
 Host: two.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /14360003 HTTP/1.1\r
 Host: one.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1437 b/tests/data/test1437
index 6a48444fb3910a5b98c78c0f76a3fd8b9637dea5..07346a9e8c22de14295654b469543b9b4dc8f7c7 100644 (file)
--- a/tests/data/test1437
+++ b/tests/data/test1437
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/1437 -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1437 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1437 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/1437", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1438 b/tests/data/test1438
index 8aaedb71e6f2269b3f40c0410b502c94db2ba91b..14818829e257c22c8f46eff802f5d84cc72d2e3e 100644 (file)
--- a/tests/data/test1438
+++ b/tests/data/test1438
@@ -48,11 +48,9 @@ HTTP
 <protocol>
 GET /1438 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<strip>
-^User-Agent:.*
-</strip>
 </verify>
 </testcase>

diff --git a/tests/data/test1439 b/tests/data/test1439
index 91edd2248229bb19418b4d1dfa7c605f4d5fd1b5..a76ccf002ad2f74d73aa98720234157cae230caf 100644 (file)
--- a/tests/data/test1439
+++ b/tests/data/test1439
@@ -48,11 +48,9 @@ testdata
 <protocol>
 GET /1439 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<strip>
-^User-Agent:.*
-</strip>
 </verify>
 </testcase>

diff --git a/tests/data/test1443 b/tests/data/test1443
index 69688670688dfb69f724d7d94a31fb8a296ae24a..7da739e54e9c5794c78a5bc1f7335e3c2eca3144 100644 (file)
--- a/tests/data/test1443
+++ b/tests/data/test1443
@@ -52,12 +52,10 @@ perl -e 'exit((stat("log/1443"))[9] != 960898200)'
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1443 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1448 b/tests/data/test1448
index 87ffed60d11e2299d0849f022204fc51b0bcca0a..38c022756483e00fa9c99f9ccaa1b12f0de0efc3 100644 (file)
--- a/tests/data/test1448
+++ b/tests/data/test1448
@@ -59,16 +59,15 @@ http://åäö.se:%HTTPPORT/1448 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -L --c
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1448 HTTP/1.1\r
 Host: xn--4cab6c.se:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /14480001 HTTP/1.1\r
 Host: xn--4cab6c.se:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1455 b/tests/data/test1455
index 8483d7bb8982df4c9620334c97964d8c13c4cdd9..b8a864f81e9227d87e11da819ae6d6a3e81e8a00 100644 (file)
--- a/tests/data/test1455
+++ b/tests/data/test1455
@@ -47,9 +47,6 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %HTTPPORT/proxy-line/
 </strippart>
@@ -57,6 +54,7 @@ s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %HTTPPORT/proxy-line/
 proxy-line\r
 GET /1455 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Testno: 1455\r
 \r

diff --git a/tests/data/test1456 b/tests/data/test1456
index 16a78b2af63c60bf9fd099d3cd3f9efa41f614b2..59e0739189a0884956b726b16d4ab35707585423 100644 (file)
--- a/tests/data/test1456
+++ b/tests/data/test1456
@@ -50,10 +50,6 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:
-</strip>
-
 # Strip off the (random) local port number. This test used to use a fixed
 # local port number that frequently causes the test to fail
 <strippart>
@@ -63,6 +59,7 @@ s/PROXY TCP6 ::1 ::1 (\d+) (\d+)/PROXY TCP6 ::1 ::1 $2/
 PROXY TCP6 ::1 ::1 %HTTP6PORT\r
 GET /1456 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1457 b/tests/data/test1457
index 575748f46be57b3d55499c58028b27b1c3f7a264..ab447ac5471dceb2c792ae576f863a439c6d2490 100644 (file)
--- a/tests/data/test1457
+++ b/tests/data/test1457
@@ -51,11 +51,9 @@ line2
 <protocol>
 GET /1457 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<strip>
-^User-Agent:.*
-</strip>
 </verify>
 </testcase>

diff --git a/tests/data/test1458 b/tests/data/test1458
index 072e43ce90956cc305261795e248fec4363042c1..c4f25f57e333b3fa725f9026b96a592a60f40479 100644 (file)
--- a/tests/data/test1458
+++ b/tests/data/test1458
@@ -43,12 +43,10 @@ HTTP with wildcard --resolve
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1458 HTTP/1.1\r
 Host: example.com:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1460 b/tests/data/test1460
index d7b30c5e83c8864b550ba5ef67d524aa6aaa8543..1cc13353e925a472011e90cf9bf839528ba68e7c 100644 (file)
--- a/tests/data/test1460
+++ b/tests/data/test1460
@@ -47,9 +47,6 @@ initial content
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 # Warning: --include and --remote-header-name cannot be combined.
 <errorcode>
 2

diff --git a/tests/data/test1465 b/tests/data/test1465
index 65608dd37498aaa543047703f225692b236f6db8..d1e553865c7243b700073b1bd5fc38d4c27ff498 100644 (file)
Binary files a/tests/data/test1465 and b/tests/data/test1465 differ

diff --git a/tests/data/test15 b/tests/data/test15
index 3b1fa4369649b54c4ebf40d7a346bba1da61ab42..a82fa0cf63376508de0137f0c5849526a98c0387 100644 (file)
--- a/tests/data/test15
+++ b/tests/data/test15
@@ -44,12 +44,10 @@ Content-Length: 26
 Repeated nonsense-headers
 http://%HOSTIP:%HTTPPORT/want/15 200 26
 </stdout>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/15 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test150 b/tests/data/test150
index e9fde393bd185b4a8307ee5a7e37f530158d9b5c..2179163de38491d7112f20d46c84af71d65e32a1 100644 (file)
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -83,20 +83,17 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /150 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /150 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1502 b/tests/data/test1502
index 4c084d644f2780f384fe3a8fe9669b82b6b2fb4b..9e7bcf25747999af4dda19c4d35ee085d6f3c1c6 100644 (file)
--- a/tests/data/test1502
+++ b/tests/data/test1502
@@ -45,9 +45,6 @@ http://google.com:%HTTPPORT/1502 %HTTPPORT %HOSTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1502 HTTP/1.1\r
 Host: google.com:%HTTPPORT\r

diff --git a/tests/data/test1503 b/tests/data/test1503
index 8665de60c0a10cccce3a188add14a04fec8142b1..288639463c081ab50f0855cfa2d8f309c36dc61b 100644 (file)
--- a/tests/data/test1503
+++ b/tests/data/test1503
@@ -45,9 +45,6 @@ http://google.com:%HTTPPORT/1503 %HTTPPORT %HOSTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1503 HTTP/1.1\r
 Host: google.com:%HTTPPORT\r

diff --git a/tests/data/test1504 b/tests/data/test1504
index b8463c526c3b38ded0ef012cb6550044bd6c84f6..5ca66076e0809c7a4a654f7c084a67ec2bb7c2e6 100644 (file)
--- a/tests/data/test1504
+++ b/tests/data/test1504
@@ -45,9 +45,6 @@ http://google.com:%HTTPPORT/1504 %HTTPPORT %HOSTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1504 HTTP/1.1\r
 Host: google.com:%HTTPPORT\r

diff --git a/tests/data/test1505 b/tests/data/test1505
index c6e5a7ca1b9e47d15bd3b5b584e9cbb71b5bc908..14e1141d43c68cd88c60ea9fe0498208e2fd4a3e 100644 (file)
--- a/tests/data/test1505
+++ b/tests/data/test1505
@@ -45,9 +45,6 @@ http://google.com:%HTTPPORT/1505 %HTTPPORT %HOSTIP
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1505 HTTP/1.1\r
 Host: google.com:%HTTPPORT\r

diff --git a/tests/data/test151 b/tests/data/test151
index 8f20d1d8b5d15f48a51a2b806bd1ae14131a9d01..03a55b4dcf31280893fe46f099db40cfa96edf5b 100644 (file)
--- a/tests/data/test151
+++ b/tests/data/test151
@@ -34,13 +34,10 @@ http://%HOSTIP:%HTTPPORT/151
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET /151 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test152 b/tests/data/test152
index 2cc521614c48c4556b29e9b68a34ccbd99170b9e..2c48b037952f64d23265b3989d6819315428ddd9 100644 (file)
--- a/tests/data/test152
+++ b/tests/data/test152
@@ -35,13 +35,10 @@ http://%HOSTIP:%HTTPPORT/152 --fail
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET /152 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1524 b/tests/data/test1524
index ed0c0476e1e0c83dd606e5609e45e6cf951a0c89..3490540207cb8214c4187328271579c6df82cab5 100644 (file)
--- a/tests/data/test1524
+++ b/tests/data/test1524
@@ -55,20 +55,18 @@ moo
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 PUT /blah/1524 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 4\r
 Expect: 100-continue\r
 \r
 moo
 GET /blah/moo.html&testcase=/15240002 HTTP/1.1\r
-User-Agent: this should be ignored\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 

diff --git a/tests/data/test153 b/tests/data/test153
index 1f55f39b674dd0c8d5dcbb2f63b4d1411d2ef088..a582595aca8db185a1508ff875a1773068eaac1c 100644 (file)
--- a/tests/data/test153
+++ b/tests/data/test153
@@ -89,34 +89,34 @@ http://%HOSTIP:%HTTPPORT/1530001 -u testuser:testpass --digest http://%HOSTIP:%H
 <verify>
 <strip>
 ^Authorization.*cnonce
-^User-Agent:.*
 </strip>
 <protocol>
 GET /1530001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1530001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530001", response="f4f83139396995bac665f24a1f1055c7"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1530002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1530002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530002", response="f84511b014fdd0ba6494f42871079c32"\r
-User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1530002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/1530002", cnonce="MTA4MzIy", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5\r
-User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test154 b/tests/data/test154
index 3d693f4b3f40c9f46d52de01da1c6d56a58b5664..616051cbc4d454cd3f6af9ef2bf3a86cf03376ce 100644 (file)
--- a/tests/data/test154
+++ b/tests/data/test154
@@ -82,12 +82,10 @@ four is the number of lines
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /154 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r
@@ -95,7 +93,7 @@ Expect: 100-continue
 PUT /154 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/154", response="b71551e12d1c456e47d8388ecb2edeca"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r

diff --git a/tests/data/test155 b/tests/data/test155
index 0cfd10eeadea5073f6999c771b9126de70a8bad8..6e19a4f2621d69738ac62b942624f87a37c2941b 100644 (file)
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -108,12 +108,10 @@ four is the number of lines
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /155 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r
@@ -121,13 +119,14 @@ Expect: 100-continue
 PUT /155 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 \r
 PUT /155 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r

diff --git a/tests/data/test1551 b/tests/data/test1551
index 507266a85149c125f8fe1a59a919dfbb46a99503..c41a14643ba4f8f4990152f33afa9dfe59292938 100644 (file)
--- a/tests/data/test1551
+++ b/tests/data/test1551
@@ -47,9 +47,6 @@ http://%HOSTIP:%HTTPPORT/1551
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1551 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test1556 b/tests/data/test1556
index 0f99abd815fc96def6cdeeb3a08acb5072f9fe6c..06f5732c808a642c0c8014f38d6873f752aa753d 100644 (file)
--- a/tests/data/test1556
+++ b/tests/data/test1556
@@ -46,9 +46,6 @@ http://%HOSTIP:%HTTPPORT/1556
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1556 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test156 b/tests/data/test156
index 098de218de016dee255355970e8b8a80941f5138..fafedc29930f85170479ba82bf770752bc195b1a 100644 (file)
--- a/tests/data/test156
+++ b/tests/data/test156
@@ -40,13 +40,10 @@ four is the number of lines
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /156 HTTP/1.1\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r

diff --git a/tests/data/test1561 b/tests/data/test1561
index 69352fda2fd196a7ab0691da48a9358f107e8bf2..bfdb439dfe57160b518497ab35c50236da4130b3 100644 (file)
--- a/tests/data/test1561
+++ b/tests/data/test1561
@@ -73,18 +73,15 @@ Cookies set over HTTP can't override secure ones
 </command>
 </client>
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /15610001 HTTP/1.1\r
 Host: www.example.com\r
-User-Agent: curl/7.62.0-DEV\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /15610002 HTTP/1.1\r
 Host: www.example.com\r
-User-Agent: curl/7.62.0-DEV\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1562 b/tests/data/test1562
index 59cb9ccba9efb4985f68a946fe62b25b01c7df0a..af29f54bc818ff9772d5cf037bdce47e34b3b948 100644 (file)
--- a/tests/data/test1562
+++ b/tests/data/test1562
@@ -48,21 +48,21 @@ Expire secure cookies over HTTPS
 </command>
 </client>
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /15620001 HTTP/1.1\r
 Host: www.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /15620002 HTTP/1.1\r
 Host: www.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: foo=123\r
 \r
 GET /15620001 HTTP/1.1\r
 Host: www.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1563 b/tests/data/test1563
index a3597b9b5330acfd7f490b0f653b831f1d54159c..7d88ddc68339de16ee4885c26ef4b263daa7ae54 100644 (file)
--- a/tests/data/test1563
+++ b/tests/data/test1563
@@ -33,15 +33,13 @@ http://%HOSTIP:%HTTPPORT/15630001 -L -H "Host: www.example.com"
 </command>
 </client>
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <errorcode>
 1
 </errorcode>
 <protocol>
 GET /15630001 HTTP/1.1\r
 Host: www.example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1566 b/tests/data/test1566
index cc3ac474a26780a1b496b045dc4b7b00085b1502..90cb40a5e98b77b7760c1f21b431057ce9650ea3 100644 (file)
--- a/tests/data/test1566
+++ b/tests/data/test1566
@@ -46,12 +46,10 @@ downloaded already
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1566 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-None-Match: "123456"\r
 \r

diff --git a/tests/data/test1567 b/tests/data/test1567
index 088ebf4971facd69c86c349fcc5f281acd683e3f..ff779df08d8b10cbc52f2a6b1188b769b7c92dcd 100644 (file)
--- a/tests/data/test1567
+++ b/tests/data/test1567
@@ -48,9 +48,6 @@ http://%HOSTIP:%HTTPPORT/1567
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1567 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test157 b/tests/data/test157
index 77700f6ade43a9347268608984bc0875c9437d49..fee7a6a4473ba78b5ffc792584736fcbc2f11211 100644 (file)
--- a/tests/data/test157
+++ b/tests/data/test157
@@ -34,12 +34,10 @@ http://%HOSTIP:%HTTPPORT/157 -u testuser:testpass --anyauth
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /157 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test158 b/tests/data/test158
index dca51b163e819e86fd922e1a8c26abf645476af9..238399a05b17307d6c39814d42b67edebfb2ae46 100644 (file)
--- a/tests/data/test158
+++ b/tests/data/test158
@@ -31,14 +31,13 @@ http://%HOSTIP:%HTTPPORT/158 -F name=daniel
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^User-Agent:.*
 ^Content-Type: multipart/form-data.*
 ^-----------------------.*
 </strip>
 <protocol>
 POST /158 HTTP/1.1\r
-User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 145\r
 Content-Type: multipart/form-data; boundary=----------------------------4f12fcdaa3bc\r

diff --git a/tests/data/test159 b/tests/data/test159
index a56986fbaf284326a12e129fcba4f01dd1003a2f..bb94583bd9b01593878718e8a71cf2bef7ca5b71 100644 (file)
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -69,14 +69,11 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /159 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1591 b/tests/data/test1591
index 526933a0ec1e0f85d253859cbbe01f91d7f39ce5..ce0c2687a8f926a67e85767af5e22f42e6b1b291 100644 (file)
--- a/tests/data/test1591
+++ b/tests/data/test1591
@@ -40,9 +40,6 @@ more than one byte
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /bzz/1591 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test1593 b/tests/data/test1593
index 405aa84e5b46d19361efce5c66438047fb6593fb..6719a3261f540b02390454b1134e7768b32418f3 100644 (file)
--- a/tests/data/test1593
+++ b/tests/data/test1593
@@ -35,9 +35,6 @@ http://%HOSTIP:%HTTPPORT/1593
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 # Note here the lack of If-Modified-Since
 <protocol>
 GET /1593 HTTP/1.1\r

diff --git a/tests/data/test1594 b/tests/data/test1594
index 4907ca2bef90476ae9f5a8cccce305ccdd1edd78..f29fdd6871cc046d089f6453bcb2cdd8cdbc0696 100644 (file)
--- a/tests/data/test1594
+++ b/tests/data/test1594
@@ -36,9 +36,6 @@ http://%HOSTIP:%HTTPPORT/1594
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1594 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test1595 b/tests/data/test1595
index 29b2b865f4639d236b35125674ebc5dad4316665..0216788e0ba5f72c643415d62988495a840a0a88 100644 (file)
--- a/tests/data/test1595
+++ b/tests/data/test1595
@@ -35,9 +35,6 @@ http://%HOSTIP:%HTTPPORT/1595
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1595 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test1596 b/tests/data/test1596
index 77a10f08a8215d052ad479f6cf3b410c08579a36..62ceab4b888c2082086ee87ffe26a117d4ec5308 100644 (file)
--- a/tests/data/test1596
+++ b/tests/data/test1596
@@ -36,9 +36,6 @@ http://%HOSTIP:%HTTPPORT/1596
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1596 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test16 b/tests/data/test16
index 399aa942062c2a6aa23c38cd0d1beb2523d04ae6..f8510adcf8cc07397ef86397205fa288b755f0ff 100644 (file)
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -40,13 +40,11 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://we.want.that.site.com/16 HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test160 b/tests/data/test160
index df80aef974ac46b0bd84b5b14d416920740b2a8c..4b1c5eddc7ece44cd5e4a3a143573d149bdea300 100644 (file)
--- a/tests/data/test160
+++ b/tests/data/test160
@@ -56,16 +56,15 @@ Connection: close
 surprise2
 </stdout>
 
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/160 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /wantmore/1600001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test162 b/tests/data/test162
index 29791d9af84bd4393fdd7f0a6361c737da7925ac..d15474585d7234d9b03975c97e10874393735816 100644 (file)
--- a/tests/data/test162
+++ b/tests/data/test162
@@ -44,14 +44,11 @@ http://%HOSTIP:%HTTPPORT/162 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:b
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/162 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test163 b/tests/data/test163
index b4e2d260fa40706ded0486b873666351d44703dc..e4f72061216679f3976a66f560bc86c2641d8288 100644 (file)
--- a/tests/data/test163
+++ b/tests/data/test163
@@ -46,12 +46,12 @@ yes please
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
 POST /we/want/163 HTTP/1.1\r
-User-Agent: curl/7.11.2-CVS (i686-pc-linux-gnu) libcurl/7.11.2-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.0.0\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 304\r
 Content-Type: multipart/form-data; boundary=----------------------------c2d1767eb6ac\r

diff --git a/tests/data/test1630 b/tests/data/test1630
index 1d381c7b0e12a9ed63cf6aa3d9e7e45252fce13e..7bf4066361416971077ac94dcbe21289dc19cdc3 100644 (file)
--- a/tests/data/test1630
+++ b/tests/data/test1630
@@ -41,13 +41,11 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 GET http://we.want.that.site.com/1630 HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test1633 b/tests/data/test1633
index 5d29ef139e697772da938426d3b219240ffc4be9..6b6e1eb9f4c92153105fd9cde08b664a39ac606d 100644 (file)
--- a/tests/data/test1633
+++ b/tests/data/test1633
@@ -68,28 +68,29 @@ http://%HOSTIP:%HTTPPORT/1633 -d moo --retry 1 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /1633 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 mooGET /16330002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 POST /1633 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 3\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 mooGET /16330002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test164 b/tests/data/test164
index 9240611dd502a51c0b32846c4314267a02954c37..97e2c5eac4397e497232be2724fd6c117ec3b51e 100644 (file)
--- a/tests/data/test164
+++ b/tests/data/test164
@@ -54,13 +54,11 @@ http://%HOSTIP:%HTTPPORT/want/164 -r 0-10,12-15
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/164 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=0-10,12-15\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test165 b/tests/data/test165
index 47de3919b3078ed8a3cd7cbbfffd62b47e701619..355394272fd9f8135c689cbb73062aa87211ab74 100644 (file)
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -49,17 +49,16 @@ http://www.åäö.se/page/165 -x %HOSTIP:%HTTPPORT http://www.große.de/page/165
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://www.xn--4cab6c.se/page/165 HTTP/1.1\r
 Host: www.xn--4cab6c.se\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://www.xn--groe-xna.de/page/165 HTTP/1.1\r
 Host: www.xn--groe-xna.de\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test166 b/tests/data/test166
index f170752e61d42b8c527f6a0924ece4a06d2465bd..697a2452aeb7b0ff6a0d7c63ca27ca32976556bd 100644 (file)
--- a/tests/data/test166
+++ b/tests/data/test166
@@ -38,12 +38,12 @@ data inside the file
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
 POST /we/want/166 HTTP/1.1\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 223\r
 Content-Type: multipart/form-data; boundary=----------------------------b0b3d6d23991\r

diff --git a/tests/data/test167 b/tests/data/test167
index e08555ecc3189052124303aa29dfb7e952262406..5067e779a4313107e5bda150bbe8ec088cb5d1f4 100644 (file)
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -57,14 +57,11 @@ http://data.from.server.requiring.digest.hohoho.com/167 --proxy http://%HOSTIP:%
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: Basic Zm9vOmJhcg==\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
@@ -72,7 +69,7 @@ GET http://data.from.server.requiring.digest.hohoho.com/167 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: Basic Zm9vOmJhcg==\r
 Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/167", response="13c7c02a252cbe1c46d8669898a3be26"\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test168 b/tests/data/test168
index fb87620448a219669a6f8df075b1b1d0d1d7a5fc..ddad8bb7794be35b88409a2175341291c7f9adf4 100644 (file)
--- a/tests/data/test168
+++ b/tests/data/test168
@@ -71,20 +71,17 @@ http://data.from.server.requiring.digest.hohoho.com/168 --proxy http://%HOSTIP:%
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
@@ -92,7 +89,7 @@ GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"\r
 Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/168", response="ca87f2d768a231e2d637a55698d5c416"\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test169 b/tests/data/test169
index 209dd9d90b129a1998dea84f009d048a0e713f87..6d30b2aded177c49efd8615bfa2ac5827b8d1036 100644 (file)
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -101,28 +101,25 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/169", response="95d48591985a03c4b49cb962aa7bd3e6"\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test170 b/tests/data/test170
index 9b41ddd7feb1e84824008f48cca0a45b87c0648d..58c2a3fe154cbc21d7d7f40d085577220992d6ef 100644 (file)
--- a/tests/data/test170
+++ b/tests/data/test170
@@ -33,14 +33,11 @@ http://a.galaxy.far.far.away/170 --proxy http://%HOSTIP:%HTTPPORT --proxy-user f
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 POST http://a.galaxy.far.far.away/170 HTTP/1.1\r
 Host: a.galaxy.far.far.away\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r

diff --git a/tests/data/test1700 b/tests/data/test1700
index 9ab46c9cde26fca283608d9d38c1f464b2dba8e3..ff1e2724f07eb54d09bc680edb0b1ec998a3857f 100644 (file)
--- a/tests/data/test1700
+++ b/tests/data/test1700
@@ -54,17 +54,18 @@ http://%HOSTIP:%HTTP2PORT/1700 --http2 http://%HOSTIP:%HTTP2PORT/17000001
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^User-Agent:.*
 ^X-Forwarded-Proto:.*
 ^Via:.*
 </strip>
 <protocol>
 GET /1700 HTTP/1.1\r
 Host: %HOSTIP:%HTTP2PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /17000001 HTTP/1.1\r
 Host: %HOSTIP:%HTTP2PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1701 b/tests/data/test1701
index 494328877272ce19e252488bb146a6cff42de770..d8986173419ac22e32b275a5a643ca1b6b29088a 100644 (file)
--- a/tests/data/test1701
+++ b/tests/data/test1701
@@ -45,13 +45,13 @@ http://%HOSTIP:%HTTP2PORT/1701 --http2 -d "datatosend"
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^User-Agent:.*
 ^X-Forwarded-Proto:.*
 ^Via:.*
 </strip>
 <protocol nonewline="yes">
 POST /1701 HTTP/1.1\r
 Host: %HOSTIP:%HTTP2PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 10\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test1702 b/tests/data/test1702
index 903a737c9a72a541f35df2b433b599e25c42c192..15757674dc78a089c74667ad51f48fee34bc5c7e 100644 (file)
--- a/tests/data/test1702
+++ b/tests/data/test1702
@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTP2PORT/1702 --http2 --head
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^User-Agent:.*
 ^X-Forwarded-Proto:.*
 ^Via:.*
 </strip>
 <protocol>
 HEAD /1702 HTTP/1.1\r
 Host: %HOSTIP:%HTTP2PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test171 b/tests/data/test171
index 482c0b7e238cdaf0cf5aada9c8577310522ce738..d6a8230331e8b1e0bb0c4902e02afd91046344cb 100644 (file)
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -40,12 +40,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://z.x.com/171 HTTP/1.1\r
 Host: z.x.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test172 b/tests/data/test172
index ad3628429e4a56a5a578e5c1d1a05e3a73e79025..dda8a38cf6fe79d1b36e05ba1dbc1a3e9d95dd80 100644 (file)
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/172 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: nodomain=value; partmatch=present; tool=curl; name=fool\r
 \r

diff --git a/tests/data/test173 b/tests/data/test173
index 865ef7ba239148efa6ae9a22557bfc771db3512e..1484cbe038bfc07490329111d9b2236a0e3e2f12 100644 (file)
--- a/tests/data/test173
+++ b/tests/data/test173
@@ -46,12 +46,12 @@ line8
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
 POST /we/want/173 HTTP/1.1\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 360\r
 Content-Type: multipart/form-data; boundary=----------------------------5dbea401cd8c\r

diff --git a/tests/data/test174 b/tests/data/test174
index 9767f2f52dfdc8a6c261a9ffa722c83d8449e900..e5a9d6fcb2c60fc25eecfd39c433750767210e2d 100644 (file)
--- a/tests/data/test174
+++ b/tests/data/test174
@@ -35,13 +35,10 @@ http://%HOSTIP:%HTTPPORT/174 -u testuser:testpass --anyauth -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /174 HTTP/1.1\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test175 b/tests/data/test175
index 9e005f1f593781ebadfda4563d0327ec5b7ae749..8b49a32b55c89f47166523a21b5f3dbbaf5f45e2 100644 (file)
--- a/tests/data/test175
+++ b/tests/data/test175
@@ -62,20 +62,17 @@ http://%HOSTIP:%HTTPPORT/175 -u auser:apasswd --digest -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /175 HTTP/1.1\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 POST /175 HTTP/1.1\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test176 b/tests/data/test176
index e18837af1fdf1c56b240f3c10be5b8cca26f4bb6..5fe310facc4c52f91fc42519946e149dff9b1f8a 100644 (file)
--- a/tests/data/test176
+++ b/tests/data/test176
@@ -64,21 +64,18 @@ http://%HOSTIP:%HTTPPORT/176 -u auser:apasswd --ntlm -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /176 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
 \r
 POST /176 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test177 b/tests/data/test177
index 495dea9b4352a012c361d504531f502c2f77e094..e31f1b7fa2ed9f11213695771c0f7383e6802f2a 100644 (file)
--- a/tests/data/test177
+++ b/tests/data/test177
@@ -38,13 +38,10 @@ http://%HOSTIP:%HTTPPORT/177 -u auser:apasswd --digest -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /177 HTTP/1.1\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test178 b/tests/data/test178
index d22d8149fcedc11a27bc3f7cf703fd4931e09842..b67e353ac4b73a52a1b395291432fd5c3662a12a 100644 (file)
--- a/tests/data/test178
+++ b/tests/data/test178
@@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/178
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /178 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test179 b/tests/data/test179
index 3a94c00bade3293bb914f554fa1b746a67f2c2b1..9f7bdedcf2ecd995d02922c520fb7a0342f56136 100644 (file)
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -45,12 +45,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://supertrooper.fake/c/179 HTTP/1.1\r
 Host: supertrooper.fake\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: moo2=indeed\r

diff --git a/tests/data/test18 b/tests/data/test18
index e1d76398cfcc7cdd5a6d2de666e7b0feb12c705f..0fe92f79b8b3b40e2cc5d92ded985da75f4de149 100644 (file)
--- a/tests/data/test18
+++ b/tests/data/test18
@@ -47,23 +47,20 @@ multiple requests using {} in URL
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /18 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /180002 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /180003 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test180 b/tests/data/test180
index 0b2ca0373ff895730db4131a284ab42de32e8439..1074e267c8526760b201d149f8d4c63130186d0a 100644 (file)
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -44,12 +44,10 @@ the
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /we/want/180 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 \r

diff --git a/tests/data/test1800 b/tests/data/test1800
index c308c99b0fd170b8e9cee91502be9ce0abdd8100..89f4292b3d36a7a9bf7b03aed1519850f81ed182 100644 (file)
--- a/tests/data/test1800
+++ b/tests/data/test1800
@@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/1800 --http2
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1800 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Connection: Upgrade, HTTP2-Settings\r
 Upgrade: %H2CVER\r

diff --git a/tests/data/test1801 b/tests/data/test1801
index b827ab51ee6c5aedd996bb64fa74cb34e72cc9bf..15367d2218c5a9a6e8089244de7f992f06b3b4ac 100644 (file)
--- a/tests/data/test1801
+++ b/tests/data/test1801
@@ -49,12 +49,10 @@ http://%HOSTIP:%HTTPPORT/1801 --http2
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1801 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Connection: Upgrade, HTTP2-Settings\r
 Upgrade: %H2CVER\r

diff --git a/tests/data/test181 b/tests/data/test181
index b6b55cb997121b7441c67c17f6e67bdefe55078d..c2f813579fd55ef26a10b62e7844c1851ea3459c 100644 (file)
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -44,12 +44,10 @@ the
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /we/want/181 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 79\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test183 b/tests/data/test183
index cf992a26fa21b5596b4170598598c3a5d4bf6e9c..d72081c4714931bb5c9dbd056cd1bc4107511e5a 100644 (file)
--- a/tests/data/test183
+++ b/tests/data/test183
@@ -37,19 +37,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://deathstar.another.galaxy/183 HTTP/1.1\r
-User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6\r
 Host: deathstar.another.galaxy\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://a.galaxy.far.far.away/183 HTTP/1.1\r
-User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6
 Host: a.galaxy.far.far.away\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test184 b/tests/data/test184
index 42e652e3bd55f1b0fe59b030476eb0eec404760c..1afb10df80e94130c483a114f1770702e1602397 100644 (file)
--- a/tests/data/test184
+++ b/tests/data/test184
@@ -57,18 +57,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://deathstar.another.galaxy/184 HTTP/1.1\r
 Host: another.visitor.stay.a.while.stay.foreeeeeever\r
-User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://yet.another.host/184 HTTP/1.1\r
 Host: yet.another.host\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test185 b/tests/data/test185
index 3bc58a041ac39c283e4970b14b34f3145028619b..ba48fd87bb3ce45fb494c1ec9d583385633e996d 100644 (file)
--- a/tests/data/test185
+++ b/tests/data/test185
@@ -57,18 +57,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://deathstar.another.galaxy/185 HTTP/1.1\r
 Host: another.visitor.stay.a.while.stay.foreeeeeever\r
-User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.6b zlib/1.1.4 libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://deathstar.another.galaxy/go/west/185 HTTP/1.1\r
 Host: another.visitor.stay.a.while.stay.foreeeeeever\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test186 b/tests/data/test186
index 4abc74a2b3e06f2069a031260e7049711d11a5f0..f5a75c6fd97e9d43ce5fb481b5c26d6d5be8a595 100644 (file)
--- a/tests/data/test186
+++ b/tests/data/test186
@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/we/want/186 -F "name=daniel;type=moo/foo" -F "html= <bo
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
 POST /we/want/186 HTTP/1.1\r
-User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.1 c-ares/1.2.0 libidn/0.5.2\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 320\r
 Content-Type: multipart/form-data; boundary=----------------------------212d9006ceb5\r

diff --git a/tests/data/test187 b/tests/data/test187
index b82a6c60e24d15b813ee3c2fc3ce83d853f92138..a1865412200349d44325064a2afddc6321890b76 100644 (file)
--- a/tests/data/test187
+++ b/tests/data/test187
@@ -60,16 +60,15 @@ http://%HOSTIP:%HTTPPORT?oh=what-weird=test/187 -L
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /?oh=what-weird=test/187 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /root/1870002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test188 b/tests/data/test188
index d8ca1cd47932bddddc4a052d89b12d21e36f5804..14e95c8e865c392f717c55297fef24950a8b3469 100644 (file)
--- a/tests/data/test188
+++ b/tests/data/test188
@@ -57,20 +57,17 @@ http://%HOSTIP:%HTTPPORT/188 -C 50 -L
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /188 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=50-\r
-User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /188 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=50-\r
-User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.2 libidn/0.5.2\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test189 b/tests/data/test189
index 65780f8040f566fd41be14b88c7cdb931fe2a79b..3435a52bed6bfc3a093e8746653ab02c35a5e9ef 100644 (file)
--- a/tests/data/test189
+++ b/tests/data/test189
@@ -51,20 +51,17 @@ http://%HOSTIP:%HTTPPORT/189 -C 50 -L
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /189 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=50-\r
-User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /189 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=50-\r
-User-Agent: curl/7.12.2-CVS (i686-pc-linux-gnu) libcurl/7.12.2-CVS OpenSSL/0.9.7d zlib/1.2.1.2 libidn/0.5.2\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1904 b/tests/data/test1904
index 7602854728db40b9d677321b267388390b540ad0..f75e87dab6d33eaeb0b14515ee99b4a002013f2d 100644 (file)
--- a/tests/data/test1904
+++ b/tests/data/test1904
@@ -61,20 +61,17 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT test.1904:%HTTPPORT HTTP/1.1\r
 Host: test.1904:%HTTPPORT\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
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /we/want/that/page/1904 HTTP/1.1\r
 Host: test.1904:%HTTPPORT\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
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1905 b/tests/data/test1905
index 0459b10b4641ad925133e305f19b4ce7aedd2f66..1fafddf607a5209d33cacb9b9ecb93ed804846d3 100644 (file)
--- a/tests/data/test1905
+++ b/tests/data/test1905
@@ -39,9 +39,6 @@ http://%HOSTIP:%HTTPPORT/we/want/1905
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/1905 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test1906 b/tests/data/test1906
index 0ff2b2be04e4031853bdd9f3a4c76e7e5686bc17..0c476a154ad5bc5c22e2bef7aadd030c936416bc 100644 (file)
--- a/tests/data/test1906
+++ b/tests/data/test1906
@@ -39,9 +39,6 @@ http://%HOSTIP:%HTTPPORT/1906
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1906 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test1907 b/tests/data/test1907
index 93f37051e7831ab831d2baa99097d190c351d4c0..85cabde16e46b27315f8baca613ab665f7777bc7 100644 (file)
--- a/tests/data/test1907
+++ b/tests/data/test1907
@@ -37,9 +37,6 @@ lib1907
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1907 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test1908 b/tests/data/test1908
index 00ce98a6aa144cbba6dbb19b34889f61e1e6827f..b63e03ad30e029dd6c84dd70fa124c8716756b7a 100644 (file)
--- a/tests/data/test1908
+++ b/tests/data/test1908
@@ -57,9 +57,6 @@ lib1908
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1908 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test1909 b/tests/data/test1909
index bde0e5e0f75c0c008e7a204e5260b16cdfb7924f..ba082529ae1a944a611a15268f8b813224505bd7 100644 (file)
--- a/tests/data/test1909
+++ b/tests/data/test1909
@@ -43,16 +43,15 @@ HTTP GET --retry-all-errors to overcome partial transfer
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1909 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /1909 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test1910 b/tests/data/test1910
index cd2e2cf46a38b2e3d8c44239a34c9a706b6ce033..cd44c0269abff55ddf67a0e09ec2549a0019214f 100644 (file)
--- a/tests/data/test1910
+++ b/tests/data/test1910
@@ -49,9 +49,6 @@ lib1910
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /1910 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test192 b/tests/data/test192
index 42cebc031fea7a5afdfc8a6b6cf9acffe6be346c..9a54a1a064d07032e7f9a4fe2895719e8611f6dc 100644 (file)
--- a/tests/data/test192
+++ b/tests/data/test192
@@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/192 -w "%{num_connects}\n"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /192 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test193 b/tests/data/test193
index c5425bb3f2c6af648101515d0cfbbbe646ff2abd..6a9c674e069d0f63cf6c0141ea506a99f78c387c 100644 (file)
--- a/tests/data/test193
+++ b/tests/data/test193
@@ -48,16 +48,15 @@ http://%HOSTIP:%HTTPPORT/193 -w "%{num_connects}\n" -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /193 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /193 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test194 b/tests/data/test194
index 730446f79f13d6aaf56bef60af0cb32ae6067b71..323ac0f38d48954797d669ea5aba75f24930d55d 100644 (file)
--- a/tests/data/test194
+++ b/tests/data/test194
@@ -55,13 +55,11 @@ http://%HOSTIP:%HTTPPORT/want/194 -C 87 --fail
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/194 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=87-\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test197 b/tests/data/test197
index 4d06cc5da05225946a311cd64c2d0f4c3804c2f5..052a0ad34bb0c5a198061e1be019bfc3d383f72d 100644 (file)
--- a/tests/data/test197
+++ b/tests/data/test197
@@ -44,16 +44,15 @@ http://%HOSTIP:%HTTPPORT/197 --retry 1000
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /197 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /197 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test198 b/tests/data/test198
index 0200366c5a47bcbe8c9f03116fe366a5f2612b36..56dd74b4c1465a88803b22c116fbaf61c4eee00d 100644 (file)
--- a/tests/data/test198
+++ b/tests/data/test198
@@ -53,16 +53,15 @@ http://%HOSTIP:%HTTPPORT/198 --retry 1000
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /198 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /198 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test199 b/tests/data/test199
index 72675b5356402ddd8d2fb7e9f9bd8a6ff4cfc8a8..69a3cecc6daec58892fdb8390d65ddba4c10ab06 100644 (file)
--- a/tests/data/test199
+++ b/tests/data/test199
@@ -42,16 +42,15 @@ HTTP with -d, -G and {}
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /199?foo=moo&moo=poo HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /199?foo=moo&moo=poo HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2 b/tests/data/test2
index 9f9c5061894b4a28f03c4616b4919c92c073e459..bd53ed58c9fcd73a26937597e7cc2afeac17fe9d 100644 (file)
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -36,13 +36,11 @@ HTTP GET with user and password
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic ZmFrZTp1c2Vy\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2001 b/tests/data/test2001
index 9232499f9e92f6dc5e035d232a2e6d541fb5acf5..4286f1d1e9bfa5faef95ddc7d68a8684a1487771 100644 (file)
--- a/tests/data/test2001
+++ b/tests/data/test2001
@@ -63,12 +63,10 @@ moo
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20010001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 USER anonymous\r

diff --git a/tests/data/test2002 b/tests/data/test2002
index efe75fa3b09452fd238465804e52e2cd9e7b45f9..cad7cdf828bcffd060bf1d6d9773774016968d04 100644 (file)
--- a/tests/data/test2002
+++ b/tests/data/test2002
@@ -72,12 +72,10 @@ moo
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20020001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 USER anonymous\r

diff --git a/tests/data/test2003 b/tests/data/test2003
index 68ae7142916472bc205b517f41bb20a612cbabf6..12b4722d9d271d340d182640c136b685cafcc913 100644 (file)
--- a/tests/data/test2003
+++ b/tests/data/test2003
@@ -72,12 +72,10 @@ moo
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20030001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 USER anonymous\r
@@ -104,6 +102,7 @@ SIZE 20030002
 RETR 20030002\r
 GET /20030001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 QUIT\r

diff --git a/tests/data/test2005 b/tests/data/test2005
index f78b4be56b1ff51b931ae8059727ee4ba83e407c..f26bf239a2951bdbc06652d850db386c97f8f093 100644 (file)
--- a/tests/data/test2005
+++ b/tests/data/test2005
@@ -64,12 +64,10 @@ perl %SRCDIR/libtest/notexists.pl log/2005 log/name2005
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2005 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2006 b/tests/data/test2006
index 4cb61192d75aecb6f7b2cc501c92e7b57d7b384d..addf86f014df58fce044499fe1c90778cb5486de 100644 (file)
--- a/tests/data/test2006
+++ b/tests/data/test2006
@@ -73,12 +73,10 @@ perl %SRCDIR/libtest/notexists.pl log/2006 log/name2006
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2006 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2007 b/tests/data/test2007
index 738ac35f96e5657466aaf2c02d1b51e814cc1f12..4c456151a3db4e1ea0437136e7e89965a2d04430 100644 (file)
--- a/tests/data/test2007
+++ b/tests/data/test2007
@@ -74,12 +74,10 @@ perl %SRCDIR/libtest/notexists.pl log/2007 log/name2007
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2007 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2008 b/tests/data/test2008
index b29ba911b8ed0a28eca6c80f719b441fbc055281..ec41adb35d75c88663cd5f81f4b4efe34fc61a6c 100644 (file)
--- a/tests/data/test2008
+++ b/tests/data/test2008
@@ -66,12 +66,10 @@ perl %SRCDIR/libtest/notexists.pl log/2008 log/name2008 log/outfile2008
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2008 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2009 b/tests/data/test2009
index 3cf4e4c48fa1545f2769280c24816d368b916058..aa71a0ac1f75ac32ec4d9269c3c309eb4d0cdadf 100644 (file)
--- a/tests/data/test2009
+++ b/tests/data/test2009
@@ -67,12 +67,10 @@ perl %SRCDIR/libtest/notexists.pl log/2009 log/name2009 log/outfile2009
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2009 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2010 b/tests/data/test2010
index 08f1bfaa4465b32ae9cf8b8737764ff7c5dffbb2..cd0c4835457794def224a23982c43f88b33aa05e 100644 (file)
--- a/tests/data/test2010
+++ b/tests/data/test2010
@@ -66,12 +66,10 @@ perl %SRCDIR/libtest/notexists.pl log/2010 log/name2010 log/outfile2010
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2011 b/tests/data/test2011
index a84502317c0c83889ccba00f3b841d59c4e0061a..1d081afcbfdfab1ca6a9f6856220f63b60c78bfd 100644 (file)
--- a/tests/data/test2011
+++ b/tests/data/test2011
@@ -64,12 +64,10 @@ perl %SRCDIR/libtest/notexists.pl log/2011 log/name2011
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2011 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2012 b/tests/data/test2012
index 6751269d59beb4ecb609de1ffeeff27f026c6416..ae627a9af993f4588d8fc559bccf4ee8145c1edc 100644 (file)
--- a/tests/data/test2012
+++ b/tests/data/test2012
@@ -63,12 +63,10 @@ perl %SRCDIR/libtest/notexists.pl log/2012 log/name2012
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2012 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2023 b/tests/data/test2023
index 382b6cb8a3df69c6be1eb6f8273efe9d8df8b213..0b155b2d2ecd3099c4e9d82b32a9619da525799b 100644 (file)
--- a/tests/data/test2023
+++ b/tests/data/test2023
@@ -128,9 +128,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20230100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2024 b/tests/data/test2024
index cd06b7c9f50671fe501eeb66b049fe97b95a51ec..c062b4c0f882037e9ecff34761d1b6547ada438d 100644 (file)
--- a/tests/data/test2024
+++ b/tests/data/test2024
@@ -142,9 +142,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20240100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2025 b/tests/data/test2025
index 282c698501f77f3965b95218cd030f58ff94f3b0..7a8fff15277bdbe468edf9234d289f79e6dbd917 100644 (file)
--- a/tests/data/test2025
+++ b/tests/data/test2025
@@ -224,9 +224,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20250100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2026 b/tests/data/test2026
index afbd4f31e456012ca4280841f7a2dc67b854b30a..a505737d732fd40ee0bde944d20a3806356a7fe6 100644 (file)
--- a/tests/data/test2026
+++ b/tests/data/test2026
@@ -178,9 +178,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20260100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2027 b/tests/data/test2027
index 3302a155dc9083983e7248daa02def7115edb2a2..3983e8854866ef09b3faccc37fa5d3b094b740a1 100644 (file)
--- a/tests/data/test2027
+++ b/tests/data/test2027
@@ -201,9 +201,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20270100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2028 b/tests/data/test2028
index 92a6371616156d8bc0ebaa8ea997e9ef294b1e48..c7b70c8f2126fbedfa32db67ec876b6c26650a3e 100644 (file)
--- a/tests/data/test2028
+++ b/tests/data/test2028
@@ -260,9 +260,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20280100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2029 b/tests/data/test2029
index 59a793ebe27eccdecbf0ac150e5b5a36db6fafd5..67313c414f39a94b8709fbb1a4a84d2670d673c2 100644 (file)
--- a/tests/data/test2029
+++ b/tests/data/test2029
@@ -197,9 +197,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20290100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2030 b/tests/data/test2030
index a158a907a94cb003684f80f9aab237d9d04d22a4..1d281ab9f940381ffb0c69ea4b404de7e571f5fa 100644 (file)
--- a/tests/data/test2030
+++ b/tests/data/test2030
@@ -249,9 +249,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20300100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2031 b/tests/data/test2031
index 9acfeef72d2ff29224a5e1b85d4df94566abbe9c..dabba374908ad8692c71521354a5e32b22cf3fb2 100644 (file)
--- a/tests/data/test2031
+++ b/tests/data/test2031
@@ -263,9 +263,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20310100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2032 b/tests/data/test2032
index 8200b8de5d561c8ecd29090002b498a71ce7f950..52574fe77ab64a6d1805822547d3db471fdae5c8 100644 (file)
--- a/tests/data/test2032
+++ b/tests/data/test2032
@@ -95,9 +95,6 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20320100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test2034 b/tests/data/test2034
index 9bf0a817c64e6d2698024bc716c0c76de4b26f4d..57e3d8627893b1be64ee1c357c9bcebda2ab5a13 100644 (file)
--- a/tests/data/test2034
+++ b/tests/data/test2034
@@ -45,12 +45,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2034 HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2036 b/tests/data/test2036
index 4b2ec43a8193957062a8ca39fbc895fabbcbc803..f022d1444d019b6f6fc6e976cb7eb059259fde13 100644 (file)
--- a/tests/data/test2036
+++ b/tests/data/test2036
@@ -29,9 +29,6 @@ HTTP, -O with no slash at all in the URL
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <errorcode>
 23
 </errorcode>

diff --git a/tests/data/test2037 b/tests/data/test2037
index d630538e20bba4f4fa0e31e2d4d75771361d3c1d..84a6676cd1653bbc4544a73d5177fa5c2aefd0cd 100644 (file)
--- a/tests/data/test2037
+++ b/tests/data/test2037
@@ -45,12 +45,11 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
 </strip>
 <protocol>
 GET /2037 HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2040 b/tests/data/test2040
index ac600174ec7d1429c74fdb842c740d425e3a7e13..cec8a6bcc8bbff3332e40f057b6e507a6f70ecc3 100644 (file)
--- a/tests/data/test2040
+++ b/tests/data/test2040
@@ -47,17 +47,16 @@ HTTP Basic authorization, then without authorization
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /20400100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /20400200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2041 b/tests/data/test2041
index 50018e40126ff22f6b6e6b8bf190991331749a32..d10abaa0235bd2f59148bc83dc499ebea584f563 100644 (file)
--- a/tests/data/test2041
+++ b/tests/data/test2041
@@ -45,12 +45,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2041 HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2046 b/tests/data/test2046
index ec49c86398ab5f3ec733d69f57ef7c6564959272..e85c00f2319d38cb0946335ea071a7cbbbc32be0 100644 (file)
--- a/tests/data/test2046
+++ b/tests/data/test2046
@@ -59,16 +59,15 @@ http://åäö.se:%HTTPPORT/2046 --resolve xn--4cab6c.se:%HTTPPORT:%HOSTIP -w "%{
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2046 HTTP/1.1\r
 Host: xn--4cab6c.se:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /20460001 HTTP/1.1\r
 Host: xn--4cab6c.se:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2047 b/tests/data/test2047
index 1471d00511aae7534160e757bc8dde68be38498c..cda2f918e6f9c305b46c55c8d30a95dad0498c07 100644 (file)
--- a/tests/data/test2047
+++ b/tests/data/test2047
@@ -61,17 +61,16 @@ http://åäö.se/2047 -x %HOSTIP:%HTTPPORT -w "%{num_connects}\n%{num_redirects}
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://xn--4cab6c.se/2047 HTTP/1.1\r
 Host: xn--4cab6c.se\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://xn--4cab6c.se/20470001 HTTP/1.1\r
 Host: xn--4cab6c.se\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test2049 b/tests/data/test2049
index efa576e98d3fe2ec9d451f5c2f151586accd16f9..0653e59003476fa02bf767e59a281d3530de5bed 100644 (file)
--- a/tests/data/test2049
+++ b/tests/data/test2049
@@ -38,24 +38,25 @@ http://www1.example.com:8081/2049 --connect-to ::%HOSTIP:%HTTPPORT --next http:/
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2049 HTTP/1.1\r
 Host: www1.example.com:8081\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2049 HTTP/1.1\r
 Host: www2.example.com:8082\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2049 HTTP/1.1\r
 Host: www3.example.com:8083\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2049 HTTP/1.1\r
 Host: www4.example.com:8084\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2050 b/tests/data/test2050
index 5eef3dae2dd28264e9e9a0f43316a77fd6915ccd..d4b7e6417b7bab34ecb7e4d0cf4c5d67a4116164 100644 (file)
--- a/tests/data/test2050
+++ b/tests/data/test2050
@@ -61,18 +61,17 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT connect.example.com.2050:%HTTPPORT HTTP/1.1\r
 Host: connect.example.com.2050:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /2050 HTTP/1.1\r
 Host: www.example.com.2050\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2051 b/tests/data/test2051
index e8c6bed1d383797f97a1bd7e756556c742491e3b..97f113800462e46854dbae9b81de0d3284c22cd9 100644 (file)
--- a/tests/data/test2051
+++ b/tests/data/test2051
@@ -38,20 +38,20 @@ http://%HOSTIP:%HTTPPORT/2051 -w "%{num_connects}\n" --next --connect-to ::%HOST
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2051 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2051 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2051 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2052 b/tests/data/test2052
index 082002f2c7bb49dbfc8fe935ffd8a8bae165c6f8..70549db6296928cafb33cba8f82a9cabf3b693ab 100644 (file)
--- a/tests/data/test2052
+++ b/tests/data/test2052
@@ -38,16 +38,15 @@ http://www.example.com:%HTTPPORT/2052 --resolve www.example.com:%HTTPPORT:%HOSTI
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2052 HTTP/1.1\r
 Host: www.example.com:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2052 HTTP/1.1\r
 Host: www.example.com:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2053 b/tests/data/test2053
index 98e78454ec89982e14109ea7b7c931e1420b04ec..abf1366cc0d0befd633a7e3c6eff1d98691414a5 100644 (file)
--- a/tests/data/test2053
+++ b/tests/data/test2053
@@ -38,16 +38,15 @@ http://10.0.0.1:8081/2053 --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --next ht
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2053 HTTP/1.1\r
 Host: 10.0.0.1:8081\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2053 HTTP/1.1\r
 Host: [fc00::1]:8082\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2054 b/tests/data/test2054
index 2a0b54ebc08810afdadb89406008157574057b06..a79c59ca3a075717a95a8b98b9e0b7b87a5cfe3b 100644 (file)
--- a/tests/data/test2054
+++ b/tests/data/test2054
@@ -38,24 +38,25 @@ http://%HOSTIP:%HTTPPORT/2054 --connect-to foo::bar: --connect-to :123::456 --ne
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2054 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2054 HTTP/1.1\r
 Host: www.example.com:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2054 HTTP/1.1\r
 Host: %HOSTIP:8083\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2054 HTTP/1.1\r
 Host: www.example.com:8084\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2055 b/tests/data/test2055
index a5fac62be5b4a69f5355e386e460f6cea6bc87e5..5608b81f93a949c3b274a17c643c0825465b8522 100644 (file)
--- a/tests/data/test2055
+++ b/tests/data/test2055
@@ -62,18 +62,17 @@ http://www.example.com.2055/2055 --connect-to ::connect.example.com.2055:%HTTPPO
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT connect.example.com.2055:%HTTPPORT HTTP/1.1\r
 Host: connect.example.com.2055:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /2055 HTTP/1.1\r
 Host: www.example.com.2055\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2056 b/tests/data/test2056
index 5d2584eec03e298aaed6b5f4c67bfb17432502e9..fc3d14773d9dcf6c047af292873176216744fa30 100644 (file)
--- a/tests/data/test2056
+++ b/tests/data/test2056
@@ -53,13 +53,11 @@ CURL_STUB_GSS_CREDS="KRB5_Alice"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2056 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Negotiate IktSQjVfQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjE6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2057 b/tests/data/test2057
index 92d7824c17c0a793bb937e7b802d2a0b6b1b87a7..f9c379076ddd1542031f28f8f6610359e5413e7f 100644 (file)
--- a/tests/data/test2057
+++ b/tests/data/test2057
@@ -69,18 +69,17 @@ CURL_STUB_GSS_CREDS="NTLM_Alice"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2057 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjI6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2057 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjM6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2058 b/tests/data/test2058
index 613dff00135f53238adb692ce103fd634a1fc2f1..e1a80146669dd222d821b1de485c76e545d64933 100644 (file)
--- a/tests/data/test2058
+++ b/tests/data/test2058
@@ -81,14 +81,11 @@ test
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -97,6 +94,7 @@ GET http://%HOSTIP:%HTTPPORT/2058 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2058", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm=SHA-256\r
 Content-Range: bytes 2-4/5\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 3\r

diff --git a/tests/data/test2059 b/tests/data/test2059
index 15799ae07fc7562349923f24affe615ca04686af..4b3ed0f502813410740296e398bc5db12566723e 100644 (file)
--- a/tests/data/test2059
+++ b/tests/data/test2059
@@ -81,14 +81,11 @@ test
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -97,6 +94,7 @@ GET http://%HOSTIP:%HTTPPORT/2059 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2059", response="fc09be8192851e284e73e8b719b32a2f6f91cca0594e68713da8c49dc2c1656e", algorithm=SHA-512-256, userhash=true\r
 Content-Range: bytes 2-4/5\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 3\r

diff --git a/tests/data/test206 b/tests/data/test206
index f99ac4c71e1e75b0e73dd16b3b59930357252e48..494326495f3552c5611ad333f5b33e5a4e4f5677 100644 (file)
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -85,22 +85,21 @@ http://test.remote.haxx.se.206:8990/path/2060002 --proxy http://%HOSTIP:%HTTPPOR
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 CONNECT test.remote.haxx.se.206:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.206:8990\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.haxx.se.206:8990 HTTP/1.1\r
 Host: test.remote.haxx.se.206:8990\r
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.206:8990", response="003e36decb4dbf6366b3ecb9b87c24ec"\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /path/2060002 HTTP/1.1\r
-User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r
 Host: test.remote.haxx.se.206:8990\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 [DISCONNECT]

diff --git a/tests/data/test2060 b/tests/data/test2060
index 05ce35103c1b3a2d8e077eb95fb74026c7917808..dfb4bd5b364e46179b290d03a7bff2fec0f6c4fc 100644 (file)
--- a/tests/data/test2060
+++ b/tests/data/test2060
@@ -81,14 +81,11 @@ test
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/2060 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 2-4/5\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -97,6 +94,7 @@ GET http://%HOSTIP:%HTTPPORT/2060 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2060", response="3ce1e25ffa611bdbe90e2ab367b9602fa223db9f6de76ac667f0d6157e2178a6", algorithm=SHA-512-256\r
 Content-Range: bytes 2-4/5\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 3\r

diff --git a/tests/data/test2061 b/tests/data/test2061
index bee88e34a079d07f9ef4cbdde6247dc8d5ac7c59..6953423a3622a223f9728ae26540018c6bd7d83d 100644 (file)
--- a/tests/data/test2061
+++ b/tests/data/test2061
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2061 -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2061 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2061 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2061", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2062 b/tests/data/test2062
index f6d4aff24d0412dc2456a68c617534855daa389e..6075263de39b3a625763965419f769ab87c71f85 100644 (file)
--- a/tests/data/test2062
+++ b/tests/data/test2062
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2062 -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2062 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2062 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2062", response="2af735ec3508f4dff99248ffbbe9de9002bfd7cc770cfa2b026cb334042a54e3", algorithm=SHA-512-256\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2063 b/tests/data/test2063
index af9a9f0aa7191767e93a5bb9dbe637c3ed1f839c..557e593613059d46ec76f256ada9e70dba906094 100644 (file)
--- a/tests/data/test2063
+++ b/tests/data/test2063
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2063 -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2063 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2063 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/2063", response="43f7ab531dff687b5dc75617daa59d1fd67d648341d6d2655ca65ef5064cfb51", algorithm=SHA-512-256, userhash=true\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2064 b/tests/data/test2064
index bfaaa05e8f7ad05ccdbf760a648247ec45277feb..fc196f25834e253dfa9bcb0c6bf6d7b9ce65d32e 100644 (file)
--- a/tests/data/test2064
+++ b/tests/data/test2064
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2064 -u testuser:test2pass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2064 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2064 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2064", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2065 b/tests/data/test2065
index d18b008ad86070d8088513570f3ab4a41d5bef33..f352e6bcc27c43faa9a7703d69bf38e59192cb2d 100644 (file)
--- a/tests/data/test2065
+++ b/tests/data/test2065
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2065 -u testuser:test2pass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2065 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2065 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2065", response="5a5f20b0e601aeddc6f96422c2332d49ff431c49ab143b5f836ef76e9ac78f5e", algorithm=SHA-512-256\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2066 b/tests/data/test2066
index b6effee0e496c9e1020169d47068241e5c0763ca..31a143d696755f8cb28416e29b88ad1cd02bec17 100644 (file)
--- a/tests/data/test2066
+++ b/tests/data/test2066
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/2066 -u testuser:test2pass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2066 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2066 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/2066", response="a2e2ae589f575fb132991d6f550ef14bf7ef697d2fef1242d2498f07eafc77dc", algorithm=SHA-512-256, userhash=true\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2067 b/tests/data/test2067
index c203343e60d7cbc0869e1843c56864c027bb7aa0..0ae407606f7e1a6a5148e6c3b275e8e1764e4bc5 100644 (file)
--- a/tests/data/test2067
+++ b/tests/data/test2067
@@ -66,12 +66,10 @@ HTTP POST --digest with SHA256 and user-specified Content-Length header
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /2067 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
@@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded
 POST /2067 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2067", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test2068 b/tests/data/test2068
index 5a197ce27d439515533febd82051cd4424170211..21003bdb26e66f7ce56e1eec50da30da7f8a5138 100644 (file)
--- a/tests/data/test2068
+++ b/tests/data/test2068
@@ -66,12 +66,10 @@ HTTP POST --digest with SHA-512-256, userhash=false and user-specified Content-L
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /2068 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
@@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded
 POST /2068 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2068", response="4bc9c97a72f1856bcec9b0e1518c6b7ee28773f91357d56840bdc30bd89ca68f", algorithm=SHA-512-256\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test2069 b/tests/data/test2069
index 99fd71d0eee6313541c7aeb616aeac181d4aadfd..fb3d15dcd0750356b8dad4f19f57079c80c2e3e9 100644 (file)
--- a/tests/data/test2069
+++ b/tests/data/test2069
@@ -66,12 +66,10 @@ HTTP POST --digest with SHA-512-256, userhash=true and user-specified Content-Le
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /2069 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
@@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded
 POST /2069 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2069", response="ff13d977110a471f30de75e747976e4de78d7a3d2425cd23ff46e67f4bc9ead7", algorithm=SHA-512-256, userhash=true\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test207 b/tests/data/test207
index caff810579dddba17c91bf3c10591af82fedc25f..1ce2338a3d7001eb7638bacfbeadd5a911adca01 100644 (file)
--- a/tests/data/test207
+++ b/tests/data/test207
@@ -48,12 +48,10 @@ http://%HOSTIP:%HTTPPORT/207
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /207 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2070 b/tests/data/test2070
index f03c87b492184287d10934cce076146639559fa8..1039e84a52f8784df6ae9ad990f5139e5ac19cfc 100644 (file)
--- a/tests/data/test2070
+++ b/tests/data/test2070
@@ -49,12 +49,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2070 HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2073 b/tests/data/test2073
index ed942f018be6c29ac01ac37cf573350f2e28b7a8..160ddbbcb9ff8e0f57139dc1c528804e97f7e103 100644 (file)
--- a/tests/data/test2073
+++ b/tests/data/test2073
@@ -42,11 +42,12 @@ http://%HOSTIP:%HTTPPORT/2073 -F 'name=a;filename=a.pdf' --next http://%HOSTIP:%
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
 POST /2073 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 189\r
 \r
@@ -56,6 +57,7 @@ Content-Type: application/pdf
 a\r
 POST /2073 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 184\r
 \r

diff --git a/tests/data/test2074 b/tests/data/test2074
index ecff8fe7e9ea5d0f5757817e62dbfb5eb1696702..e3e18126ce1b31f168aeed8a195fa01bd85bbfd5 100644 (file)
--- a/tests/data/test2074
+++ b/tests/data/test2074
@@ -43,13 +43,11 @@ http://%HOSTIP:%HTTPPORT/2074 --oauth2-bearer mF_9.B5f-4.1JqM
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2074 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Bearer mF_9.B5f-4.1JqM\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2076 b/tests/data/test2076
index 2c477b1a532680068eb8cacf670837178849abab..5974286f688ec5c0512458483ce19937e11f8c08 100644 (file)
--- a/tests/data/test2076
+++ b/tests/data/test2076
@@ -57,17 +57,16 @@ HTTP with digest auth and URI contains query
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /2076?query HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /2076?query HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/2076?query", response="5758bd3bbde7f33236e6ccd278eb59af"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2078 b/tests/data/test2078
index 51ace296a67d9499f9cfe9596d2eb80169aa5479..c881b0499f3d8e52faf212084daea6501461b929 100644 (file)
--- a/tests/data/test2078
+++ b/tests/data/test2078
@@ -38,12 +38,10 @@ http://%HOSTIP:%HTTPPORT/2078 -u : --negotiate --data name=value
 <errorcode>
 0
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /2078 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 10\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test208 b/tests/data/test208
index 1c86558a8520d394b065f017356ed1748a0151f2..abb30df97c5cf8ccd27e1a320dd55dbce34defef 100644 (file)
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -50,13 +50,11 @@ the
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT ftp://daniel:mysecret@host.com/we/want/208 HTTP/1.1\r
 Host: host.com:21\r
 Authorization: Basic ZGFuaWVsOm15c2VjcmV0\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 78\r

diff --git a/tests/data/test209 b/tests/data/test209
index 67a7fc513de75ffa6759c1f67771cc393607cdb6..afe16bfa6b8fe852419b36df9ac82f94228dfbc5 100644 (file)
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -101,23 +101,22 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.209:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.209:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.209:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET /path/2090002 HTTP/1.1\r
-User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r
 Host: test.remote.example.com.209:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2100 b/tests/data/test2100
index 83aa7287b548eba38d8887ee0692bdcb636b8711..4352f61b43b7ba7a27024289ac485fbcc609f2c3 100644 (file)
Binary files a/tests/data/test2100 and b/tests/data/test2100 differ

diff --git a/tests/data/test213 b/tests/data/test213
index e6d7cd55abc28107d87349bb73cec35c6c373d31..bb579971d0f5c3e2b729463896d33eca883813b3 100644 (file)
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -101,23 +101,22 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol nonewline="yes">
 CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0\r
 Host: test.remote.example.com.213:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.213:%HTTPPORT HTTP/1.0\r
 Host: test.remote.example.com.213:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 POST /path/2130002 HTTP/1.1\r
-User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r
 Host: test.remote.example.com.213:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 6\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test214 b/tests/data/test214
index 930182f5d3f17e3dee80ce3d1f14c490e8c45434..3f305ee198912aa8dd3214cc609c6c4975dbec52 100644 (file)
--- a/tests/data/test214
+++ b/tests/data/test214
@@ -40,12 +40,10 @@ MSYS2_ARG_CONV_EXCL=http://
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /{}\/214 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test217 b/tests/data/test217
index 4ab51a2f3172cf51398d245be10aef6fdc987cd3..b06734473a7eb8dae64b962fb63703419eff1bcb 100644 (file)
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -41,12 +41,10 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 CONNECT test.remote.example.com.217:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.217:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>

diff --git a/tests/data/test218 b/tests/data/test218
index 138c4b7b17804307236edc4ac226103c76ab09d0..4951c264bf74ee2c262d0d5465b92b922795e4dd 100644 (file)
--- a/tests/data/test218
+++ b/tests/data/test218
@@ -39,12 +39,10 @@ just some tiny teeny contents
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /218 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
 Expect: 100-continue\r

diff --git a/tests/data/test22 b/tests/data/test22
index f45f8627c9a5f9fa4b7f20018416ac60725cca6d..57dd7ddaaa0834feed72cb72448f47b97231157f 100644 (file)
--- a/tests/data/test22
+++ b/tests/data/test22
@@ -32,13 +32,10 @@ get HTTP with URL > 10000 bytes
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET /aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/22 HTTP/1.1\r
-User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test220 b/tests/data/test220
index 7fd264345f97c969d5bdee375e3f134cf208f7ea..4b2e41672d086d7d04e73fe8ebde74bd5b54587f 100644 (file)
--- a/tests/data/test220
+++ b/tests/data/test220
@@ -54,15 +54,13 @@ http://%HOSTIP:%HTTPPORT/220 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /220 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test221 b/tests/data/test221
index 3a85439d0f34f3a5c27b6ac79e0d88eb2563b94e..3fab37f52c035d93b68d05448a91e5eb5abfd3de 100644 (file)
--- a/tests/data/test221
+++ b/tests/data/test221
@@ -54,15 +54,13 @@ http://%HOSTIP:%HTTPPORT/221 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /221 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test222 b/tests/data/test222
index 865266e07e1b24ac839fe0db834f52d930a3fcb7..27d169fed9642e24bdeda80ff090b84cfd5ce8e6 100644 (file)
--- a/tests/data/test222
+++ b/tests/data/test222
@@ -185,15 +185,13 @@ http://%HOSTIP:%HTTPPORT/222 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /222 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test223 b/tests/data/test223
index 884967e3f65a4c2055d8cc97d94d8c43a4f3f927..52bbb7c6f90e0394a147debc4133e1407bbfba79 100644 (file)
--- a/tests/data/test223
+++ b/tests/data/test223
@@ -75,15 +75,13 @@ http://%HOSTIP:%HTTPPORT/223 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /223 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test224 b/tests/data/test224
index a56046873ac5e0713606688edd12d53733061c52..b632ffd29b2822480a9502d244d5b01f79c3fbee 100644 (file)
--- a/tests/data/test224
+++ b/tests/data/test224
@@ -90,15 +90,13 @@ http://%HOSTIP:%HTTPPORT/224 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /224 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test230 b/tests/data/test230
index 2174434b397fa2770477ccad12ddef1ffedde5d2..eb696da026b5e50e8a6b2d2a57253988d3c12528 100644 (file)
--- a/tests/data/test230
+++ b/tests/data/test230
@@ -186,15 +186,13 @@ http://%HOSTIP:%HTTPPORT/230 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /230 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test232 b/tests/data/test232
index d0860c6163a7bf4fa944da9cee9f1f65fb55b3da..e0e703422e6cb749b4793d1826b865ab8a8df394 100644 (file)
--- a/tests/data/test232
+++ b/tests/data/test232
@@ -185,15 +185,13 @@ http://%HOSTIP:%HTTPPORT/232 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /232 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test233 b/tests/data/test233
index a38d8c95e1e9469e758a7b62b74c342e4aa31485..eb732eae65a9ac116adb295753f97358a700ee3b 100644 (file)
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -75,20 +75,19 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://first.host.it.is/we/want/that/page/233 HTTP/1.1\r
 Host: first.host.it.is\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/2330002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test234 b/tests/data/test234
index 9e197cd1d3e35926779e55d1a0743db2c37889a4..3c5146a373b4a010f9e023dfaf8f4e768e290560 100644 (file)
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -77,14 +77,12 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://first.host.it.is/we/want/that/page/234 HTTP/1.1\r
 Host: first.host.it.is\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
@@ -92,6 +90,7 @@ GET http://goto.second.host.now/2340002 HTTP/1.1
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test239 b/tests/data/test239
index b6f387933d9ee660a50c90196d03d7b994e57f3a..b9e18723554e88cbb6daa6820721e724ec2e289a 100644 (file)
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -76,14 +76,11 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol nonewline="yes">
 POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -92,7 +89,7 @@ Content-Type: application/x-www-form-urlencoded
 POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 6\r

diff --git a/tests/data/test24 b/tests/data/test24
index a2b28a9fdbc29b2cc077b065e89419069813e9b5..54147eddfd2f7720eb7398c5be28a56eccb91715 100644 (file)
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -30,13 +30,10 @@ http://%HOSTIP:%HTTPPORT/24 --fail --silent --show-error
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET /24 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test240 b/tests/data/test240
index cd8594d63f46c7f27e6ae0cf7baf91fc7083bd12..0d452ee259d737012372a354ac06ecbd0fbccb2f 100644 (file)
--- a/tests/data/test240
+++ b/tests/data/test240
@@ -45,12 +45,10 @@ HTTP-IPv6 GET
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:
-</strip>
 <protocol>
 GET /240 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test241 b/tests/data/test241
index 46eae1f7248b55fc293021a8d58c211248e3bde2..e530aaff523d5b4dfef890bb5c738fdddba11bc7 100644 (file)
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -43,12 +43,10 @@ HTTP-IPv6 GET (using ip6-localhost)
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:
-</strip>
 <protocol>
 GET /241 HTTP/1.1\r
 Host: ip6-localhost:%HTTP6PORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test242 b/tests/data/test242
index 9457c58c3c87c334992c1aa78dfcd2d2964dd1f9..aee927ea7bec63f04ced3cc77463497a8a29dcd4 100644 (file)
--- a/tests/data/test242
+++ b/tests/data/test242
@@ -40,13 +40,11 @@ HTTP-IPv6 GET with username+password in URL
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:
-</strip>
 <protocol>
 GET /242 HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
 Authorization: Basic Zm9vYmFyOmJhcmZvbw==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test243 b/tests/data/test243
index f7b2386b52c32b3ed8dac821eb50ceacbf0f4cc5..87826a82eadb3825f072acd1240fa5a0f52f5f2d 100644 (file)
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -97,13 +97,10 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol nonewline="yes">
 POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 6\r
@@ -112,7 +109,7 @@ Content-Type: application/x-www-form-urlencoded
 postitPOST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -121,7 +118,7 @@ Content-Type: application/x-www-form-urlencoded
 POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 6\r

diff --git a/tests/data/test245 b/tests/data/test245
index cbb5ee31d65206553fcfa54e4cd44cb9484eaa89..5750b4fa3b43dd3d9fab94096a30968209ff9c99 100644 (file)
--- a/tests/data/test245
+++ b/tests/data/test245
@@ -63,13 +63,10 @@ http://%HOSTIP:%HTTPPORT/245 -u auser:apasswd --digest -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /245 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
@@ -77,7 +74,7 @@ Content-Type: application/x-www-form-urlencoded
 POST /245 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/245", response="379a439b1737ba257c1d2f103914b18b"\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test246 b/tests/data/test246
index acf47da5dfa2b5759492c123f2288d05b783d69d..b5469f3e5119d580cb17694ad88c938f11cb6186 100644 (file)
--- a/tests/data/test246
+++ b/tests/data/test246
@@ -73,13 +73,10 @@ http://%HOSTIP:%HTTPPORT/246 -u auser:apasswd --digest -d "junkelijunk"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /246 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.12.1-CVS (i686-pc-linux-gnu) libcurl/7.12.1-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r
@@ -87,7 +84,7 @@ Content-Type: application/x-www-form-urlencoded
 POST /246 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/246", response="761e6fc9a760c39d587092e8d840e740"\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 11\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test249 b/tests/data/test249
index 4f99c2af7067a62501044131a01491c550875776..6b3dc6ef1df02ecac32471838efb961108e832bc 100644 (file)
--- a/tests/data/test249
+++ b/tests/data/test249
@@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/249 -z "dec 12 12:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /249 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
 \r

diff --git a/tests/data/test25 b/tests/data/test25
index 15030ae92698933a4c6321384c67343f9c5efe8a..d694cdc75e09af5a9d4d2ad6471d4493187103b4 100644 (file)
--- a/tests/data/test25
+++ b/tests/data/test25
@@ -73,38 +73,35 @@ http://%HOSTIP:%HTTPPORT/want/25 -L --max-redirs 5
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET /want/25 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/data/reply/25 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/data/reply/data/reply/25 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/data/reply/data/reply/data/reply/25 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test256 b/tests/data/test256
index 1567c629262080c9853dcc9f932f12d1aabd78f1..e873d579cd5e703bb419cbe5b40754bcb57353c8 100644 (file)
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -45,14 +45,12 @@ proxy
 <errorcode>
 33
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/want/256 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn\r
 Range: bytes=78-\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test257 b/tests/data/test257
index 59a419bb17f8304e6d9e87563f330b652368b054..e43baf56eaa2bc9b9dfef38f9a623ce7d983ac93 100644 (file)
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -85,27 +85,24 @@ machine anotherone.com login user2 password passwd2
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://supersite.com/want/257 HTTP/1.1\r
 Host: supersite.com\r
 Authorization: Basic dXNlcjE6cGFzc3dkMQ==\r
-User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://anotherone.com/2570002 HTTP/1.1\r
 Host: anotherone.com\r
 Authorization: Basic dXNlcjI6cGFzc3dkMg==\r
-User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://athird.com/2570003 HTTP/1.1\r
 Host: athird.com\r
-User-Agent: curl/7.14.0-CVS (i686-pc-linux-gnu) libcurl/7.14.0-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test258 b/tests/data/test258
index 6c10564b871f3d12827de492237060ce13edcc00..c89d5f37ea33473546da4f370ff6d00e0bbfe985 100644 (file)
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -77,12 +77,12 @@ bar
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------).*
+^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
 POST http://remotehost:54321/we/want/258 HTTP/1.1\r
 Host: remotehost:54321\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 409\r
@@ -107,8 +107,8 @@ bar
 ------------------------------7c633d5c27ce--\r
 POST http://remotehost:54321/we/want/258 HTTP/1.1\r
 Host: remotehost:54321\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/258", response="2501654ca391f0b5c8c12a1da77e34cd"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 409\r

diff --git a/tests/data/test259 b/tests/data/test259
index 58d25120fa500385a868302b2d9b2ff46fa3ca2e..d1da0243294274602dd019dea83a34a42f78a3a4 100644 (file)
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -73,12 +73,12 @@ bar
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------).*
+^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
 POST http://remotehost:54321/we/want/259 HTTP/1.1\r
 Host: remotehost:54321\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Expect: 100-continue\r
@@ -104,8 +104,8 @@ bar
 ------------------------------7c633d5c27ce--\r
 POST http://remotehost:54321/we/want/259 HTTP/1.1\r
 Host: remotehost:54321\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5"\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Expect: 100-continue\r

diff --git a/tests/data/test26 b/tests/data/test26
index 072dbf7d36ca8d1b4e7fb6d4debfcc7228b0b30f..073fed3d36147e9a6cd55b887102d72a98e9d725 100644 (file)
--- a/tests/data/test26
+++ b/tests/data/test26
@@ -31,13 +31,10 @@ http://%HOSTIP:%HTTPPORT/want/26 -o - -o -
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl.*
-</strip>
 <protocol>
 GET /want/26 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test260 b/tests/data/test260
index 589e86e8a6aa5ba4730b822fcda260f855271d52..1e6dbe2e05606b60fb06c7a7ca9290ddd80ab5c0 100644 (file)
--- a/tests/data/test260
+++ b/tests/data/test260
@@ -42,12 +42,10 @@ HTTP GET URL without slash but with questionmark
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /?260 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test262 b/tests/data/test262
index 4c28f22d7c4195d92b757c8f1600b451dfe39f4b..8f803cfbf459bc9e4b35d373bdd645390a748601 100644 (file)
Binary files a/tests/data/test262 and b/tests/data/test262 differ

diff --git a/tests/data/test263 b/tests/data/test263
index e10c20741f64eb6f92b7427dde88637427cfe313..6c054a11d9d39e7a250e5cff5cb8461eaa626692 100644 (file)
--- a/tests/data/test263
+++ b/tests/data/test263
@@ -41,12 +41,10 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:
-</strip>
 <protocol>
 GET http://veryveryremotesite.com/263 HTTP/1.1\r
 Host: veryveryremotesite.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test264 b/tests/data/test264
index 5aca0e6c5c267fcd8078a9b2b52f70911d730b34..836c979a61286781225be4d54b04ab72cba1a868 100644 (file)
--- a/tests/data/test264
+++ b/tests/data/test264
@@ -37,13 +37,11 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://we.want.that.site.com/264 HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTp1c2Vy\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test265 b/tests/data/test265
index a27633afcca3504c47d6f5927275872b9287dd9b..c6204730323ed403dca5a5d0ec7c9f5b1ae84403 100644 (file)
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -102,23 +102,22 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol nonewline="yes">
 CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.265:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 CONNECT test.remote.example.com.265:%HTTPPORT HTTP/1.1\r
 Host: test.remote.example.com.265:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 POST /path/2650002 HTTP/1.1\r
-User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4\r
 Host: test.remote.example.com.265:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 6\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test266 b/tests/data/test266
index 6b07a782bceeda8c2071e5c141f9ebe944fb07b7..0997ae7b6a9654d52dd06bb1dab7a179f108825f 100644 (file)
--- a/tests/data/test266
+++ b/tests/data/test266
@@ -56,12 +56,10 @@ http://%HOSTIP:%HTTPPORT/266 -D log/heads266
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /266 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test267 b/tests/data/test267
index a0c3d33c62772cb76af55c3ccf3d28f4cff6daba..ed10b22a3d27ff3d3955492f0f7c787e7c746ad2 100644 (file)
--- a/tests/data/test267
+++ b/tests/data/test267
@@ -82,14 +82,11 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /267 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Header1: yes\r
 Header2: no\r
@@ -99,7 +96,7 @@ Content-Type: application/x-www-form-urlencoded
 POST /267 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Header1: yes\r
 Header2: no\r

diff --git a/tests/data/test268 b/tests/data/test268
index c9c7311abbc9b61c219a0783e5bedbaf95142ec5..70a5a73dd1924c89af7d50bca4045cedda1a972d 100644 (file)
--- a/tests/data/test268
+++ b/tests/data/test268
@@ -42,12 +42,10 @@ HTTP POST a non-existing file
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /268 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test269 b/tests/data/test269
index 6b7159b0b5b5651ee366ec719619a02ed38d49ed..ffecfedbf36f5b00a3b6bc7ad04b33b299af6599 100644 (file)
--- a/tests/data/test269
+++ b/tests/data/test269
@@ -40,12 +40,10 @@ http://%HOSTIP:%HTTPPORT/269 --ignore-content-length
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /269 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test27 b/tests/data/test27
index 6fed3d9949fd3b290d0b70dec268611c243bc71f..54b4f8a6233d2058815acdcdf3f4164c0db44f95 100644 (file)
--- a/tests/data/test27
+++ b/tests/data/test27
@@ -33,21 +33,21 @@ Get same cookie page several times
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl.*
-</strip>
 <protocol>
 GET /want/27 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/27 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: thewinneris=nowayyouwin\r
 \r
 GET /want/27 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: thewinneris=nowayyouwin\r
 \r

diff --git a/tests/data/test273 b/tests/data/test273
index ce0be331e6fe4cb1a6a798d12438a01f27f1e239..45c293512e24e4aa8a5d391e81ab23e1db7cbac1 100644 (file)
--- a/tests/data/test273
+++ b/tests/data/test273
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/273 -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /273 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /273 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/273", response="576ae57b1db0039f8c0de43ef58e49e3"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test274 b/tests/data/test274
index 579341c82402cc904ff9f18f133f29752429f9b8..dd1b816de192f44d919b2fd16527c79ba9af596f 100644 (file)
--- a/tests/data/test274
+++ b/tests/data/test274
@@ -34,13 +34,10 @@ http://%HOSTIP:%HTTPPORT/want/274 -L --max-redirs 0
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET /want/274 HTTP/1.1\r
-User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test275 b/tests/data/test275
index 6065b4d811ba5b4b24b8aca67dc3a24fc1e06f6d..cff99d588f1c0a9bf7d8f479fe7f22ef8bb4b3d5 100644 (file)
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -64,14 +64,11 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <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
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
@@ -79,11 +76,13 @@ Proxy-Connection: Keep-Alive
 GET /we/want/that/page/275 HTTP/1.1\r
 Host: remotesite.com.275:%HTTPPORT\r
 Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/want/that/page/275 HTTP/1.1\r
 Host: remotesite.com.275:%HTTPPORT\r
 Authorization: Basic aWFtOm15c2VsZg==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test276 b/tests/data/test276
index 34e2235e108e3c725b1164a47838c2096d48c05a..2fa554d9d8a0f9ab0d48f5fe0d0ac249bc9409a2 100644 (file)
--- a/tests/data/test276
+++ b/tests/data/test276
@@ -59,16 +59,15 @@ HTTP Location: following with multiple question marks in URLs
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want?uri=http://anything/276?secondq/276 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test277 b/tests/data/test277
index d3e9d0fa490fee66b8c887df92b88b69969edb49..7b60d40ea216c0476bfa81104de07e888db48339 100644 (file)
--- a/tests/data/test277
+++ b/tests/data/test277
@@ -33,17 +33,14 @@ http://%HOSTIP:%HTTPPORT/want/277 -F name=daniel -H "Content-Type: text/info"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^--------------------------[a-z0-9]*/--------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=------------------------/
 </strippart>
 <protocol>
 POST /want/277 HTTP/1.1\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 146\r
 Content-Type: text/info; boundary=------------------------\r

diff --git a/tests/data/test278 b/tests/data/test278
index 620f56b173a3127cc820be0ce769fbe651ecad30..d706c33ce48667dff6dcb095d21d61c9352aaade 100644 (file)
--- a/tests/data/test278
+++ b/tests/data/test278
@@ -37,13 +37,11 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://we.want.that.site.com/278 HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTo=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test279 b/tests/data/test279
index d5f4194f106062fa5ff967f4d1f0c11b21d06933..d26ddd9d8c91108a542aa7b508fb7c582c9df0f1 100644 (file)
--- a/tests/data/test279
+++ b/tests/data/test279
@@ -38,13 +38,11 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://we.want.that.site.com/279 HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTo=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test28 b/tests/data/test28
index 1f80d5f486dfef735913762404941bbd0947d8c4..703c6d35b0cc2fe706c6f43557d31d03da0b205c 100644 (file)
--- a/tests/data/test28
+++ b/tests/data/test28
@@ -58,16 +58,15 @@ http://%HOSTIP:%HTTPPORT/want/28 -L
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/28 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test281 b/tests/data/test281
index d399fc05b6c0ce70ae52d4c9c6403e72663861f7..f78b0c1465559c4801f795cbd082851e271d6198 100644 (file)
--- a/tests/data/test281
+++ b/tests/data/test281
@@ -46,12 +46,10 @@ Weird
 <errorcode>
 22
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /we/want/281 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 38\r
 Expect: 100-continue\r

diff --git a/tests/data/test282 b/tests/data/test282
index aa8aba5a2ca67f2f23e6105d17f780e9b78bdfb7..578c102a54fa884e214cbd2b54c52242e803fa4b 100644 (file)
--- a/tests/data/test282
+++ b/tests/data/test282
@@ -32,12 +32,10 @@ http://%HOSTIP:%HTTPPORT/282
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /282 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test29 b/tests/data/test29
index 9a7bd9ef9f5496e6dab1c59fa889ff0397456c9a..b8a59c34a3f28abd54bc3bcb10880822fdc9faf3 100644 (file)
--- a/tests/data/test29
+++ b/tests/data/test29
@@ -36,12 +36,10 @@ http://%HOSTIP:%HTTPPORT/want/29 -m 2
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/29 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test292 b/tests/data/test292
index 800e8d17872d1e4da27dd133a39e78e1234f0b2f..12d131dbf3d6d0818bbdd2f950dc3e1e9a6abccf 100644 (file)
--- a/tests/data/test292
+++ b/tests/data/test292
@@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/292 --max-filesize 1000
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /292 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test293 b/tests/data/test293
index d75fc9a3c362b5df6406fdfac8e5fa0e0bdbeae5..2181a8216db73729183784c44e3b6446d4b3fa05 100644 (file)
--- a/tests/data/test293
+++ b/tests/data/test293
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/293 --max-filesize 2
 <errorcode>
 63
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /293 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test299 b/tests/data/test299
index cfa743020f3e7070f46edb8fd2a5d28516ce691c..b3fa4736112ae1c55239f6551ec6b530e8420b52 100644 (file)
--- a/tests/data/test299
+++ b/tests/data/test299
@@ -39,13 +39,11 @@ FTP over HTTP proxy with user:pass not in url
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET ftp://michal:aybabtu@host.com/we/want/299 HTTP/1.1\r
 Host: host.com:21\r
 Authorization: Basic bWljaGFsOmF5YmFidHU=\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test3 b/tests/data/test3
index 0fe2764670b8a8795a356b9f67eb7ff7341fbdf4..0dc3b4618a2f70d9fb9e0565a4e0b44b88ad66cf 100644 (file)
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -43,13 +43,11 @@ HTTP POST with auth and contents but with content-length set to 0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /3 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic ZmFrZTotdXNlcg==\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 37\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test30 b/tests/data/test30
index 70b8005f5d0386eed6f4265571c635b810389e16..ab4425db5906ba7591cc61c56477d6374526a64c 100644 (file)
--- a/tests/data/test30
+++ b/tests/data/test30
@@ -27,12 +27,10 @@ http://%HOSTIP:%HTTPPORT/want/30
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/30 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test300 b/tests/data/test300
index 7b4222d1234d19074ac5c64b331644810e6b7b6a..63e308d6df2926f514277336a9338b584c89b33c 100644 (file)
--- a/tests/data/test300
+++ b/tests/data/test300
@@ -39,12 +39,10 @@ simple HTTPS GET
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test3000 b/tests/data/test3000
index e62e53168607bd934829a883b625762537dc36a5..1fc58f2f37afc49169bb5e6f608325b4d1746d4f 100644 (file)
--- a/tests/data/test3000
+++ b/tests/data/test3000
@@ -44,12 +44,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /3000 HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test3001 b/tests/data/test3001
index 706c3f7529bdf662d9cd7d91e09c1cf154cd482b..a16bdb45ae1b331c9964ebf0de107034c11aea16 100644 (file)
--- a/tests/data/test3001
+++ b/tests/data/test3001
@@ -44,12 +44,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /3001 HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test3008 b/tests/data/test3008
index 154ce2056204247e510c53774c750df8f218d798..0010eeb86cce29b8b05a1ea4a3768b15df53a9e9 100644 (file)
--- a/tests/data/test3008
+++ b/tests/data/test3008
@@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3008 -O --output-dir %PWD/log
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /this/is/the/3008 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test3009 b/tests/data/test3009
index ec4bcea4d9cc0d00c4ab46e517f1fc13f7bff492..f9bf11b0e7407f7aadd6b34bbc94f8439a9ab34f 100644 (file)
--- a/tests/data/test3009
+++ b/tests/data/test3009
@@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3009 -O --output-dir %PWD/not-there
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /this/is/the/3009 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test301 b/tests/data/test301
index c404695789ba60fb4417823b84d1184757c746e6..760497a17c75cb916e495f83c4564930e2826048 100644 (file)
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -40,13 +40,11 @@ HTTPS GET with user and password
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /301 HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
 Authorization: Basic ZmFrZTp1c2Vy\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test3011 b/tests/data/test3011
index fcf76105085158fb2924eda5352357d450b40d7f..267d6eeeb47fdc13f622248e570bb8dd9f19ad41 100644 (file)
--- a/tests/data/test3011
+++ b/tests/data/test3011
@@ -43,12 +43,10 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3011 -O --output-dir %PWD/log/tmp --create-
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /this/is/the/3011 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test3012 b/tests/data/test3012
index 0a64faac4a746af8217d0ab41c85f84190e25161..b4441cb18752e1c6a524b99aa4d9f498c247381b 100644 (file)
--- a/tests/data/test3012
+++ b/tests/data/test3012
@@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3012 -OJ --output-dir %PWD/log
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /this/is/the/3012 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test3013 b/tests/data/test3013
index d2fcfa4c01001be9c27b23aad2ad122c975d4863..206b9e37ace3638e67b43c33533f572ba5bf3604 100644 (file)
--- a/tests/data/test3013
+++ b/tests/data/test3013
@@ -46,16 +46,15 @@ http://%HOSTIP:%HTTPPORT/this/is/the/3013 -O --output-dir %PWD/log http://%HOSTI
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /this/is/the/3013 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /another/3013 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test3014 b/tests/data/test3014
index 7fab42fcd24d8028e68e8cab67efea901bf97532..e36a0e02b7ad436bc51daab44c53d42008899851 100644 (file)
--- a/tests/data/test3014
+++ b/tests/data/test3014
@@ -48,11 +48,9 @@ testdata
 <protocol>
 GET /1439 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>
-<strip>
-^User-Agent:.*
-</strip>
 </verify>
 </testcase>

diff --git a/tests/data/test3015 b/tests/data/test3015
index 9adc88a35059db5a0045346b59ced931289d1416..9c86d024b246fc7b486142251a1058950bc507dd 100644 (file)
--- a/tests/data/test3015
+++ b/tests/data/test3015
@@ -57,16 +57,15 @@ http://%HOSTIP:%HTTPPORT/3015 -w "%{num_headers}\n" -L -o/dev/null
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /3015 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /30150001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test302 b/tests/data/test302
index 3eb9e7aeedb07df3d05cfe6b23b6fa166dbf6039..bdef98eea2aaf4d520b754f70ffb2121559ca20c 100644 (file)
--- a/tests/data/test302
+++ b/tests/data/test302
@@ -43,9 +43,6 @@ HTTPS GET over HTTP proxy fails
 <errorcode>
 56
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <data>
 </data>
 </verify>

diff --git a/tests/data/test303 b/tests/data/test303
index 01dd9ebb19dcb05f7414698695d2724b01387cc4..e05da5b2f586d830ea882e3f7825fef39beb4d10 100644 (file)
--- a/tests/data/test303
+++ b/tests/data/test303
@@ -39,12 +39,10 @@ HTTPS with 8 secs timeout
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/303 HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test304 b/tests/data/test304
index 01d3a2d67985abb9764883c13fc4ab41a769e970..50baf1ca73d23fc930eaba4ce328f28984d5923c 100644 (file)
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -41,12 +41,12 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------).*
+^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
 POST /we/want/304 HTTP/1.1\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 1386\r
 Content-Type: multipart/form-data; boundary=----------------------------c3b2ef7f0bb8\r

diff --git a/tests/data/test305 b/tests/data/test305
index 858a0040e18b7a86780879107b5cdb56abc58439..f60226cba3f8c7898dd0cdb8eb8286f88a625e43 100644 (file)
--- a/tests/data/test305
+++ b/tests/data/test305
@@ -25,9 +25,6 @@ https://%HOSTIP:%HTTPSPORT/want/305 --cacert moooo
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <errorcode>
 77
 </errorcode>

diff --git a/tests/data/test306 b/tests/data/test306
index 17306f949b5a0c76dc1ff0952526034451746eee..b9150af875b6d077194bb5621a16e0f0d3eafb52 100644 (file)
--- a/tests/data/test306
+++ b/tests/data/test306
@@ -52,12 +52,10 @@ HTTPS GET, receive no headers only data!
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /306 HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test307 b/tests/data/test307
index 03c2b3c2d0aa49c1e3e710a2fcbf8d0125b2a2a8..5fb9faa474ddbc0219f5602a87d35d6a3370e2fb 100644 (file)
--- a/tests/data/test307
+++ b/tests/data/test307
@@ -43,12 +43,10 @@ simple HTTPS GET with openssl engine
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /307 HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test309 b/tests/data/test309
index 80246a9c07b49d8dc7519932e67ad8dfc1ddf8bb..c766fca6740e85f68416aac4b823fd79fa3ab17e 100644 (file)
--- a/tests/data/test309
+++ b/tests/data/test309
@@ -65,16 +65,15 @@ HTTP Location: redirect to HTTPS URL
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/309 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /data/3090002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test31 b/tests/data/test31
index 633b480a975596d8f90f28389a2a5bfa95a1c3dd..0bf5633572f9273587bfb144dceefc7e0663b887 100644 (file)
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -86,12 +86,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/31 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test310 b/tests/data/test310
index e7a9379abad0c7d3792d36e39189e53588730bda..128c9176d005a7e6cd801eac33c8198337f81456 100644 (file)
--- a/tests/data/test310
+++ b/tests/data/test310
@@ -44,12 +44,10 @@ perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /310 HTTP/1.1\r
 Host: localhost:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test314 b/tests/data/test314
index f4703cdebc40a6f3c26ee5ae5a3383a3a1563475..899200dc19ab276f75296cdb8d9d98e5b4d872b3 100644 (file)
--- a/tests/data/test314
+++ b/tests/data/test314
@@ -181,15 +181,13 @@ http://%HOSTIP:%HTTPPORT/314 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /314 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test315 b/tests/data/test315
index c75d9ae7b74306a3058d8a43c095f9f887ca2bbd..605bb0f2d131f35f73b3a8e91b2fc25236c8c6e5 100644 (file)
--- a/tests/data/test315
+++ b/tests/data/test315
@@ -71,15 +71,13 @@ http://%HOSTIP:%HTTPPORT/315 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /315 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test316 b/tests/data/test316
index a293b46cdb40399b4fbd0f5f239ab95fcc18bf5c..6b95b37fd707b03b88ca05501bb605c9e3f64998 100644 (file)
--- a/tests/data/test316
+++ b/tests/data/test316
@@ -181,15 +181,13 @@ http://%HOSTIP:%HTTPPORT/316 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /316 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test317 b/tests/data/test317
index 68a9b5c797d5fe0e84b551f0d1eb4a86df0cb1d1..b7723c72c1d38ef2cf82da6f62c12ccaaeb629dd 100644 (file)
--- a/tests/data/test317
+++ b/tests/data/test317
@@ -75,13 +75,11 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://first.host.it.is/we/want/that/page/317 HTTP/1.1\r
 Host: first.host.it.is\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Authorization: s3cr3t\r
@@ -89,6 +87,7 @@ Authorization: s3cr3t
 GET http://goto.second.host.now/3170002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test318 b/tests/data/test318
index fd82c7aedb799f8339fc9ced1f6cdac322bb1f36..6e3621e7ca608bea8c7c6afc46530735ef2f6322 100644 (file)
--- a/tests/data/test318
+++ b/tests/data/test318
@@ -75,13 +75,11 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://first.host.it.is/we/want/that/page/318 HTTP/1.1\r
 Host: first.host.it.is\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Authorization: s3cr3t\r
@@ -89,6 +87,7 @@ Authorization: s3cr3t
 GET http://goto.second.host.now/3180002 HTTP/1.1\r
 Host: goto.second.host.now\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Authorization: s3cr3t\r

diff --git a/tests/data/test319 b/tests/data/test319
index 6a61a143a0d97982609edd48424ac5e9b0fe576c..855ea3e56e758e08a4ca9e7df412a7f20189ef0d 100644 (file)
--- a/tests/data/test319
+++ b/tests/data/test319
@@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/319 --raw
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /319 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test32 b/tests/data/test32
index 992ffcbcfd494e3938f0627972051a274a270fbe..e2c5edfbaedacc480b8009f88efe406ee2fb6be3 100644 (file)
--- a/tests/data/test32
+++ b/tests/data/test32
@@ -42,13 +42,10 @@ HTTP with -d and -G
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /32?foo=moo&moo=poo HTTP/1.1\r
-User-Agent: curl/7.9.5 (i686-pc-linux-gnu) libcurl 7.9.5-cvs (OpenSSL 0.9.5) (ipv6 enabled)\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test325 b/tests/data/test325
index 922f37ba2b609382eedb250fb7f61e23e90f4124..93d7e21a3a734d84e2ea5be3cd74070085da024d 100644 (file)
--- a/tests/data/test325
+++ b/tests/data/test325
@@ -49,12 +49,10 @@ HTTPS with attempted redirect to denied HTTP
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /325 HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test326 b/tests/data/test326
index 1a4aae5f94968e672d437fa23430cde86c3387a0..09ca9c0add6eaa7eb03b54b8bb557e85ef3c74d5 100644 (file)
--- a/tests/data/test326
+++ b/tests/data/test326
@@ -53,12 +53,10 @@ http://%HOSTIP:%HTTPPORT/326 --raw
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /326 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test327 b/tests/data/test327
index 3a1c0716224591639d0bfa01a3627c3fa2009dd7..808a4e9d1762aed9057767f89e773416711eb773 100644 (file)
--- a/tests/data/test327
+++ b/tests/data/test327
@@ -49,16 +49,15 @@ http://%HOSTIP:%HTTPPORT/we/want/327 -b none -c log/cookies327 http://%HOSTIP:%H
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/327 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/want/3270002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: foobar=name\r
 \r

diff --git a/tests/data/test328 b/tests/data/test328
index 93c00e18243e08726e721afea1d414a6b970ceb4..bc353a578e67e0f709879dbf886134ea5f464bbd 100644 (file)
--- a/tests/data/test328
+++ b/tests/data/test328
@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/hello/328 --compressed
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^User-Agent:.*
 ^Accept-Encoding:.*
 </strip>
 <protocol>
 GET /hello/328 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test329 b/tests/data/test329
index 2274d475b1800aed0643096f4e0be3bb525c8d03..e766c83ef69aaba013cc7add365a6727c4ef8232 100644 (file)
--- a/tests/data/test329
+++ b/tests/data/test329
@@ -52,17 +52,16 @@ http://%HOSTIP:%HTTPPORT/we/want/329 -b log/jar329.txt -H "Host: host.foo.com" h
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/329 HTTP/1.1\r
 Host: host.foo.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: test=no\r
 \r
 GET /we/want/3290002 HTTP/1.1\r
 Host: host.foo.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test33 b/tests/data/test33
index 9f7c31fb15599e9081e0c54c09d4f4c44656ebc8..6b3c9d72c5a9a1932801f32aa08e4a797edde10c 100644 (file)
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -42,14 +42,11 @@ http://%HOSTIP:%HTTPPORT/33 -Tlog/test33.txt -C 50
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /33 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Content-Range: bytes 50-99/100\r
-User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 50\r
 Expect: 100-continue\r

diff --git a/tests/data/test330 b/tests/data/test330
index 6cda172f66d96afadfde5151433e0258a1da1d21..40cc09740a78d561d379e15e164f121f80ac8777 100644 (file)
--- a/tests/data/test330
+++ b/tests/data/test330
@@ -73,18 +73,17 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://first.host.it.is/we/want/that/page/317 HTTP/1.1\r
 Host: first.host.it.is\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: test=yes\r
 \r
 GET http://goto.second.host.now/3170002 HTTP/1.1\r
 Host: goto.second.host.now\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test331 b/tests/data/test331
index 2ffac81f7161e6d5872a2679f355900b03f19aa1..f6b008543c76a74043464f4f5c57c7f3daeb272a 100644 (file)
--- a/tests/data/test331
+++ b/tests/data/test331
@@ -48,17 +48,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://moo/we/want/331 HTTP/1.1\r
 Host: moo\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://moo/we/want/3310002 HTTP/1.1\r
 Host: moo\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Cookie: moo=yes\r

diff --git a/tests/data/test334 b/tests/data/test334
index c02a65b8d2936a0ff4c8f30c73e8205420ba6481..f43af2381896e983d3a1d00a3f81a929b7dd0f02 100644 (file)
--- a/tests/data/test334
+++ b/tests/data/test334
@@ -31,12 +31,10 @@ http://%HOSTIP:%HTTPPORT/want/334
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/334 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test335 b/tests/data/test335
index 91d981827502dc2321899e3ad432106ba40b2da4..e3e1950f1265680f8b20bd64970c0cef5c47f713 100644 (file)
--- a/tests/data/test335
+++ b/tests/data/test335
@@ -73,20 +73,17 @@ http://digest:alot@data.from.server.requiring.digest.hohoho.com/335 --proxy http
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
@@ -94,7 +91,7 @@ GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1
 Host: data.from.server.requiring.digest.hohoho.com\r
 Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"\r
 Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/335", response="08a2e2e684047f4219a38ddc189ac00c"\r
-User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test338 b/tests/data/test338
index 0c040c28a928194c83aad4d0d333a9c9e0f8d024..83fe7263d82f8bcb9e55db2dab1afc20625ebf47 100644 (file)
--- a/tests/data/test338
+++ b/tests/data/test338
@@ -45,16 +45,15 @@ http://%HOSTIP:%HTTPPORT/338 --next http://%HOSTIP:%HTTPPORT/338 --anyauth -u fo
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /338 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /338 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 [DISCONNECT]

diff --git a/tests/data/test339 b/tests/data/test339
index 8da212e5571055d073b53cf7b7067c41e7370b0c..eca35947d5900a67d0039b56892781a6088a4b15 100644 (file)
--- a/tests/data/test339
+++ b/tests/data/test339
@@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/339 --etag-save log/etag339
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /339 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test34 b/tests/data/test34
index a332b8c4bdb158797d3a1129935944ec406e3ee2..fa4928d5c4d5caccebc993e385d04c422c015f4e 100644 (file)
--- a/tests/data/test34
+++ b/tests/data/test34
@@ -52,12 +52,10 @@ http://%HOSTIP:%HTTPPORT/34
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /34 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test341 b/tests/data/test341
index 5e952ad98f9e031953a3b11da2d80b95423fe767..726000d163265955cb4cce47a8f3d1e453881a76 100644 (file)
--- a/tests/data/test341
+++ b/tests/data/test341
@@ -46,9 +46,6 @@ http://%HOSTIP:%HTTPPORT/341 --etag-compare log/etag341
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <errorcode>
 26
 </errorcode>

diff --git a/tests/data/test342 b/tests/data/test342
index 75295cfa878ee6ce795ccdcc574e8080533ce46d..5a1615f1d8e86333f90036a6bca3d2bd3463cc32 100644 (file)
--- a/tests/data/test342
+++ b/tests/data/test342
@@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/342 --etag-compare log/etag342
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /342 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-None-Match: "21025-dc7-39462498"\r
 \r

diff --git a/tests/data/test343 b/tests/data/test343
index 5d877827f64e5025f7ed6cedd2671b976b55e35a..6e80776290a0985f44126ea6b357c4ab22dfdc6a 100644 (file)
--- a/tests/data/test343
+++ b/tests/data/test343
@@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/343 --etag-compare log/etag343 --etag-save log/out343
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /343 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-None-Match: "21025-dc7-39462498"\r
 \r

diff --git a/tests/data/test344 b/tests/data/test344
index 2b730d52411c07b1693d844a7ce271770c337fd2..5672366ecb091b6f021d588a9770f73a43bbb684 100644 (file)
--- a/tests/data/test344
+++ b/tests/data/test344
@@ -41,12 +41,10 @@ http://%HOSTIP:%HTTPPORT/344 --etag-compare log/etag344 --etag-save log/etag344
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /344 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-None-Match: ""\r
 \r

diff --git a/tests/data/test345 b/tests/data/test345
index c30c06de9692d81359c5de942a455c76a35bc9c2..87687324e4ef59ca98874f4594d673109a849e5e 100644 (file)
--- a/tests/data/test345
+++ b/tests/data/test345
@@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/345 --etag-compare log/etag345 --etag-save log/etag345
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /345 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-None-Match: "21025-dc7-39462498"\r
 \r

diff --git a/tests/data/test346 b/tests/data/test346
index 64923117e623b5955f559e92e2f65dfdb486d675..3ec7a1a9e231334a86dc2f635bf7c2a40f854df2 100644 (file)
--- a/tests/data/test346
+++ b/tests/data/test346
@@ -44,14 +44,12 @@ HTTP GET over proxy with credentials using blank passwords
 
 #
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://remote.example/346 HTTP/1.1\r
 Host: remote.example\r
 Proxy-Authorization: Basic cHVzZXI6\r
 Authorization: Basic c3VzZXI6\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test347 b/tests/data/test347
index 702c270f9cea9f7ff0670029a525b27d3831cabc..3d55a5bd24169e76bf30d584d83df40297107551 100644 (file)
--- a/tests/data/test347
+++ b/tests/data/test347
@@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/347 --etag-save log/etag347
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /347 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test35 b/tests/data/test35
index 85733a456c2ce467ebd7526553eb01ddf098efc8..5b6aba0afb7ca6d0e8f682378d130bdbf2b3dd21 100644 (file)
Binary files a/tests/data/test35 and b/tests/data/test35 differ

diff --git a/tests/data/test355 b/tests/data/test355
index e9c4cb28f83fcd52996ae2183e32c42d54e096bf..1cab2dd4a5890fb2f1a3f972e18373e4c6edbad2 100644 (file)
--- a/tests/data/test355
+++ b/tests/data/test355
@@ -44,12 +44,10 @@ h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /355 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test356 b/tests/data/test356
index c1234b45060e85afd48d0fa2271ae539f207ad59..469ab0d1e1439b920d8b2ac0fabdca675cdd2032 100644 (file)
--- a/tests/data/test356
+++ b/tests/data/test356
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/356 --alt-svc "log/altsvc-356"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /356 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test357 b/tests/data/test357
index d0437c6851927c955591c6fb4b62556b145dfb70..9e7ed86a5fdc88326f586c6bf18ee2dc67031c3e 100644 (file)
--- a/tests/data/test357
+++ b/tests/data/test357
@@ -68,18 +68,17 @@ the
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /we/want/357 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 Expect: 100-continue\r
 \r
 PUT /we/want/357 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 78\r
 \r

diff --git a/tests/data/test36 b/tests/data/test36
index 4e3fd8c87176b97d5ac50ab6a30b227d598f449a..91db26ec62f59bb476c7638aa574b51842a143d3 100644 (file)
--- a/tests/data/test36
+++ b/tests/data/test36
@@ -52,12 +52,10 @@ http://%HOSTIP:%HTTPPORT/36
 <errorcode>
 56
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /36 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test37 b/tests/data/test37
index 76876230092a097891dc4e40b2b48e9d0632c7e8..1dedfde79ccf08006d3dc25877cea0ea0880253b 100644 (file)
--- a/tests/data/test37
+++ b/tests/data/test37
@@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/37
 <errorcode>
 52
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /37 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test38 b/tests/data/test38
index db257f2f8614a58d21be070a74e8e8fe2cb9f4a3..518aae95ba6dc503199e652b972413cd880e7b88 100644 (file)
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -41,13 +41,11 @@ download on.
 <errorcode>
 33
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/38 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=78-\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test39 b/tests/data/test39
index 3c6c57328bbf399c3c2608497ad79b0ca2cd4eca..de9a516312866668c32e7adb39b6d18b6ba3f950 100644 (file)
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -40,12 +40,12 @@ foo
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|-------).*
+^(Content-Type: multipart/form-data;|-------).*
 </strip>
 <protocol>
 POST /we/want/39 HTTP/1.1\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 1184\r
 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32\r

diff --git a/tests/data/test393 b/tests/data/test393
index f03e9a246de01da05239688dad9a96cf4675c275..67ce1c10fa730ebc2711367cae8220b8645eb6e7 100644 (file)
--- a/tests/data/test393
+++ b/tests/data/test393
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/393 --max-filesize 2000000
 <errorcode>
 63
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /393 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test394 b/tests/data/test394
index b82039b4d7ef8572198360d652a0cc15b82164ef..ec7a06d92c6feeb1d5bd6428a3f7a189f317494b 100644 (file)
--- a/tests/data/test394
+++ b/tests/data/test394
@@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/394
 <errorcode>
 8
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /394 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test395 b/tests/data/test395
index 2a569bf3b680d308ef34bf9b8c1ccaf021f35e77..fae55dbf0dff24202ec1a39b3200c6fe20cfdf3f 100644 (file)
--- a/tests/data/test395
+++ b/tests/data/test395
@@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT/395
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /395 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test396 b/tests/data/test396
index 1dd03421fa67ea39726bc87a9dfafb2a90566114..01be58ac306331897d01ee2f0a7e19e7f4a8866a 100644 (file)
--- a/tests/data/test396
+++ b/tests/data/test396
@@ -185,15 +185,13 @@ http://%HOSTIP:%HTTPPORT/396 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /396 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test397 b/tests/data/test397
index 6f872e2ac76901b07d3967a53bafb4ffb6de2301..0afd21c60433780751f9091ca8b46b4a05a8396c 100644 (file)
--- a/tests/data/test397
+++ b/tests/data/test397
@@ -181,15 +181,13 @@ http://%HOSTIP:%HTTPPORT/397 --compressed
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^Accept-Encoding: .*/Accept-Encoding: xxx/
 </strippart>
 <protocol>
 GET /397 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Accept-Encoding: xxx
 \r

diff --git a/tests/data/test4 b/tests/data/test4
index 542347db5f1d279caf218434e6fe8e0ad47d298f..fe5789ad6632dcebe0c018e4aa2a618e13edbda7 100644 (file)
--- a/tests/data/test4
+++ b/tests/data/test4
@@ -37,12 +37,10 @@ Replaced internal and added custom HTTP headers
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /4 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 extra-header: here\r
 Accept: replaced\r
 X-Custom-Header:\r
@@ -51,6 +49,7 @@ X-Test2: foo;
 \r
 GET /4 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 extra-header: here\r
 Accept: replaced\r
 X-Custom-Header:\r

diff --git a/tests/data/test40 b/tests/data/test40
index 6be0d1615620469335b850dc49bae32c0838db43..42bd8e13bcb7205cd1a0ca80d19b807e301d024d 100644 (file)
--- a/tests/data/test40
+++ b/tests/data/test40
@@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/40 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/are/all/twits/40 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/are/all/moo.html/?name=d+a+niel&testcase=/400002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test42 b/tests/data/test42
index e303f3a27b12be1d7ae07ea3faa05859ff990fb3..abb3412eeed452186bee2600b71cec76e806ac57 100644 (file)
--- a/tests/data/test42
+++ b/tests/data/test42
@@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/42 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/are/all/twits/42 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/are/all/m%20o%20o.html/420002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test43 b/tests/data/test43
index 1960170137ffd62e1805de036edbac50cb4e4730..28035c89999855d8b5ec3dce4542815b067ab9fe 100644 (file)
--- a/tests/data/test43
+++ b/tests/data/test43
@@ -63,17 +63,16 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/want/43 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://%HOSTIP:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test430 b/tests/data/test430
index d4dc530dd710d005e5c19ea7e99ab321e667ba78..4a669ff7ed6651cfd11289f9ae52f86c44c2fa50 100644 (file)
--- a/tests/data/test430
+++ b/tests/data/test430
@@ -70,12 +70,10 @@ Three -K uses with --next and --data in each
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /4300001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 a: a\r
 Content-Length: 1\r
@@ -83,6 +81,7 @@ Content-Type: application/x-www-form-urlencoded
 \r
 aPOST /4300002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 b: b\r
 Content-Length: 1\r
@@ -90,6 +89,7 @@ Content-Type: application/x-www-form-urlencoded
 \r
 bPOST /4300003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 c: c\r
 Content-Length: 1\r

diff --git a/tests/data/test431 b/tests/data/test431
index 48a1b20a16e75818119b68c2f07a00959db46724..8f045482be79c80d047f8a7acfd4e2c12e0f6cdb 100644 (file)
--- a/tests/data/test431
+++ b/tests/data/test431
@@ -64,12 +64,10 @@ Two -K uses with --next and then one on cmdline
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /4310001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 a: a\r
 Content-Length: 1\r
@@ -77,6 +75,7 @@ Content-Type: application/x-www-form-urlencoded
 \r
 aPOST /4310002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 b: b\r
 Content-Length: 1\r
@@ -84,6 +83,7 @@ Content-Type: application/x-www-form-urlencoded
 \r
 bPOST /4310003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 c: c\r
 Content-Length: 1\r

diff --git a/tests/data/test432 b/tests/data/test432
index b3401b68776285b33dea2eda93980c6e12134522..a7bc37886ef90467e9b7565e1491d6edae8746ca 100644 (file)
--- a/tests/data/test432
+++ b/tests/data/test432
@@ -69,12 +69,10 @@ Use -K with --next and --config from within
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /4320001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 a: a\r
 Content-Length: 1\r
@@ -82,6 +80,7 @@ Content-Type: application/x-www-form-urlencoded
 \r
 aPOST /4320002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 b: b\r
 Content-Length: 1\r
@@ -89,6 +88,7 @@ Content-Type: application/x-www-form-urlencoded
 \r
 bPOST /4320003 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 c: c\r
 Content-Length: 1\r

diff --git a/tests/data/test433 b/tests/data/test433
index 90e54f05f264270d054fa877c1b46f65d87440ac..e7cb4d225d206fc7cfb921e6927305e0df8e459a 100644 (file)
--- a/tests/data/test433
+++ b/tests/data/test433
@@ -42,12 +42,10 @@ Verify XDG_CONFIG_HOME use to find .curlrc
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /433 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 a: a\r
 Content-Length: 11\r

diff --git a/tests/data/test434 b/tests/data/test434
index 2ab0fc1afd11256cbe24d03be019c7ac8a70a00d..a2bcc0cbdfac09f00bdd8a73e3d0bc082cd5fe15 100644 (file)
--- a/tests/data/test434
+++ b/tests/data/test434
@@ -35,12 +35,10 @@ http
 
 #
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /434 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test44 b/tests/data/test44
index 8220a1aa115efb578c7795ec98e4a1e1f83fbc9b..4b1fa450bd2024295be1c9127385f036c1fe2f54 100644 (file)
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -40,12 +40,12 @@ bar
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------).*
+^(Content-Type: multipart/form-data;|------).*
 </strip>
 <protocol>
 POST /we/want/44 HTTP/1.1\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 408\r
 Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce\r

diff --git a/tests/data/test45 b/tests/data/test45
index 3eb9ba943fd2712232e3a374c6d04f0504007110..1381920d99af99e52896431cf2a1b542e3f004c9 100644 (file)
--- a/tests/data/test45
+++ b/tests/data/test45
@@ -59,16 +59,15 @@ simple HTTP Location: without protocol in initial URL
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/45 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /want/data.cgi?moo=http://&/450002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test46 b/tests/data/test46
index 4ea259255dff7a8b8e05839f22697b702744a02c..c54a7f1fa012676543c79739e68bb14063a1e3f2 100644 (file)
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -59,12 +59,10 @@ domain..tld FALSE   /want   FALSE   0       empty
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/46 HTTP/1.1\r
 Host: domain..tld:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: empty=; mooo2=indeed2; mooo=indeed\r
 \r

diff --git a/tests/data/test47 b/tests/data/test47
index bd779d346bf69784b3da70c4d623b10bd4ea3d0d..2048f522991be454f78f455af235e01f941519ce 100644 (file)
--- a/tests/data/test47
+++ b/tests/data/test47
@@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/47 -0
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /47 HTTP/1.0\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test48 b/tests/data/test48
index 7ee05ad37799eab0b0b986e6a367f428e64ed56b..36bf656684946cce2175c7a29dfa18f980ca2fac 100644 (file)
--- a/tests/data/test48
+++ b/tests/data/test48
@@ -36,16 +36,15 @@ HTTP with -d and -G and -I
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 HEAD /48?foo=moo&moo=poo HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 HEAD /48?foo=moo&moo=poo HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 [DISCONNECT]

diff --git a/tests/data/test49 b/tests/data/test49
index 4a4175e3225a0086c3ad0d0de9878cd5720aa5ef..9192f92a15441f9d2cc16237c648bc133af34d86 100644 (file)
--- a/tests/data/test49
+++ b/tests/data/test49
@@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/49 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/are/all/twits/49 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/are/all/moo.html/490002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test490 b/tests/data/test490
index 86ebb01124259f62f7d578247681b667d7f1f3f3..6f77b7111a650346b1f1d8d0e6f4ca9341722500 100644 (file)
--- a/tests/data/test490
+++ b/tests/data/test490
@@ -45,12 +45,10 @@ surprise!
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /490 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 10\r
 Expect: 100-continue\r
@@ -58,6 +56,7 @@ Expect: 100-continue
 surprise!
 PUT /490 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 10\r
 Expect: 100-continue\r

diff --git a/tests/data/test491 b/tests/data/test491
index c230dfb78248f56687a1eace6e011abf28f3691b..87cebf1abd2afeff89eb3cbb3fbac26e2a55652e 100644 (file)
--- a/tests/data/test491
+++ b/tests/data/test491
@@ -45,12 +45,10 @@ surprise!
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /491 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 10\r
 Expect: 100-continue\r

diff --git a/tests/data/test492 b/tests/data/test492
index ddb0405ef7291910e17de7500f3484b62cebc26f..ab3c01fc2e99ead7667bfde69279b2b53b856e19 100644 (file)
--- a/tests/data/test492
+++ b/tests/data/test492
@@ -48,12 +48,10 @@ second 492 contents
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /one/first492 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Testno: 492\r
 Content-Length: 19\r
@@ -62,6 +60,7 @@ Expect: 100-continue
 first 492 contents
 PUT /two/first492 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Testno: 492\r
 Content-Length: 19\r
@@ -70,6 +69,7 @@ Expect: 100-continue
 first 492 contents
 PUT /one/second492 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Testno: 492\r
 Content-Length: 20\r
@@ -78,6 +78,7 @@ Expect: 100-continue
 second 492 contents
 PUT /two/second492 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Testno: 492\r
 Content-Length: 20\r

diff --git a/tests/data/test5 b/tests/data/test5
index b98d27b3b04c7270ddf35c2c3d72753aa9a30d38..6138820261b54a36c0e8e420aaed9ace0e4cbc1c 100644 (file)
--- a/tests/data/test5
+++ b/tests/data/test5
@@ -39,12 +39,10 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/we/want/that/page/5 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test50 b/tests/data/test50
index 84b05da7b43410778cec7e012298a15f19df1d2a..777caa259fa4dd3b07b08443ef7bba40d20d30f9 100644 (file)
--- a/tests/data/test50
+++ b/tests/data/test50
@@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/50 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/are/all/twits/50 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/are/moo.html/500002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test51 b/tests/data/test51
index b58c3570e7fae2882920d04e386665be376ec18d..7d9740ae955025d30970d16366bd1fb3ffe9b566 100644 (file)
--- a/tests/data/test51
+++ b/tests/data/test51
@@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/51 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/are/all/twits/51 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /510002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test512 b/tests/data/test512
index d259f40dff04c9859951b993abdfb30f0ee0771e..dd5cc0a0738750af9a65160c6d73aa3c8e6f05a7 100644 (file)
--- a/tests/data/test512
+++ b/tests/data/test512
@@ -40,9 +40,6 @@ http://%HOSTIP:%HTTPPORT/512
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /512 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test514 b/tests/data/test514
index ca37a5d659e9e9d0e5dd31712508f06300aa93ce..82f8041fdf77edae711fd2570879aaf99783c8cd 100644 (file)
--- a/tests/data/test514
+++ b/tests/data/test514
@@ -44,9 +44,6 @@ http://%HOSTIP:%HTTPPORT/514
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 HEAD /514 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test515 b/tests/data/test515
index 526f1e136aa38a28c9c13236402f7dfb29f46288..bea2fe6f95dc5f330f8e20358d96ab4261df1b67 100644 (file)
--- a/tests/data/test515
+++ b/tests/data/test515
@@ -39,9 +39,6 @@ http://%HOSTIP:%HTTPPORT/515
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /515 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test516 b/tests/data/test516
index 9bc175bd4cdf31fd3a77085a42ebc17a2a7601c1..c41d15e7ed5fa322af5b5658e452269fa10a2678 100644 (file)
--- a/tests/data/test516
+++ b/tests/data/test516
@@ -40,9 +40,6 @@ http://%HOSTIP:%HTTPPORT/516
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /516 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test52 b/tests/data/test52
index 14fa42bfd050015985acfdf2d74aa8331497cdb4..196ff041c2c797c72fb59a808f66e4082b8166b2 100644 (file)
--- a/tests/data/test52
+++ b/tests/data/test52
@@ -56,17 +56,15 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/52 -L
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/are/all/twits/52 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/are/all/twits/520002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test522 b/tests/data/test522
index 89a0dbf51e3d685658e7ca842dfff899487091a9..8fc07c390a7e8b92f31d4f4142fc9d26f8fc2451 100644 (file)
--- a/tests/data/test522
+++ b/tests/data/test522
@@ -43,9 +43,6 @@ http://%HOSTIP/522 %HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /522 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test523 b/tests/data/test523
index c00a0969d4324ca049503f772e7c25e2f527bf5f..03d456b05c1b9ce22dfaab0343e4d04a66e38674 100644 (file)
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -49,9 +49,6 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://www.example.com:19999/523 HTTP/1.1\r
 Host: www.example.com:19999\r

diff --git a/tests/data/test53 b/tests/data/test53
index 679a4fa84f8ea9d085b62a177ae8a2343aea9fc5..bffd063e57ebf1ea9970928e0b2ccde115e37b5f 100644 (file)
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -40,12 +40,10 @@ HTTP, junk session cookies
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/53 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: mooo=indeed\r
 \r

diff --git a/tests/data/test54 b/tests/data/test54
index 66dbe9ddb3b6c0505f3a1fb7f1bc43be78dc79f4..24f081954fdfb7adfcf54c509585b35fb5530c0a 100644 (file)
--- a/tests/data/test54
+++ b/tests/data/test54
@@ -32,12 +32,10 @@ http://%HOSTIP:%HTTPPORT/want/54 -L
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/54 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test540 b/tests/data/test540
index 871c558fbadc8b8cd188e6ddd89f8d2847bdfa2f..8f53b072c644858a73994fa67d20e2f3a8ce9e51 100644 (file)
--- a/tests/data/test540
+++ b/tests/data/test540
@@ -79,9 +79,6 @@ http://test.remote.example.com/path/540 http://%HOSTIP:%HTTPPORT silly:person cu
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 GET http://test.remote.example.com/path/540 HTTP/1.1\r
 Host: custom.set.host.name\r

diff --git a/tests/data/test544 b/tests/data/test544
index 78cb5a45e113186740e76af66c467e7d65dce700..4bf9a6cbb388f4ddd9f2652d74ee0a5f8e423671 100644 (file)
--- a/tests/data/test544
+++ b/tests/data/test544
@@ -40,9 +40,6 @@ http://%HOSTIP:%HTTPPORT/544
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /544 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test547 b/tests/data/test547
index e4ec398935deab0e80cba22819136d5fe47a1c5d..5401e06c897058351e383f775931074beed2a81b 100644 (file)
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -100,13 +100,9 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 POST http://test.remote.example.com/path/547 HTTP/1.1\r
 Host: test.remote.example.com\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
@@ -116,7 +112,6 @@ this is the blurb we want to upload
 POST http://test.remote.example.com/path/547 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -125,7 +120,6 @@ Content-Type: application/x-www-form-urlencoded
 POST http://test.remote.example.com/path/547 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r

diff --git a/tests/data/test548 b/tests/data/test548
index d636ab1b613fc68b6338bc31a0b3c04ab349c46f..3ce5ae1eae15bb75b951f82085d8f3e43a7cce60 100644 (file)
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -100,13 +100,9 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 POST http://test.remote.example.com/path/548 HTTP/1.1\r
 Host: test.remote.example.com\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
@@ -116,7 +112,6 @@ this is the blurb we want to upload
 POST http://test.remote.example.com/path/548 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -125,7 +120,6 @@ Content-Type: application/x-www-form-urlencoded
 POST http://test.remote.example.com/path/548 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r

diff --git a/tests/data/test549 b/tests/data/test549
index a9f1ca21c1e71caaee5097c1ffc1016b5bc1d72a..93c442aaeae35e51b88ec76237cc425d17d40400 100644 (file)
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -49,9 +49,6 @@ ftp://www.example.com/moo/549 http://%HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET ftp://www.example.com/moo/549;type=i HTTP/1.1\r
 Host: www.example.com:21\r

diff --git a/tests/data/test55 b/tests/data/test55
index 6623856085e43fd81eb581ae9a271ed8195f4178..216f13cefea1e5bcc85500ea88dcf845a09a37b8 100644 (file)
--- a/tests/data/test55
+++ b/tests/data/test55
@@ -48,17 +48,15 @@ http://%HOSTIP:%HTTPPORT/55 -L
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /55 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /550002 HTTP/1.1\r
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test550 b/tests/data/test550
index 1eff72a17b6d64e370aa725fc13567a5684f36c3..bd8f4223e1852153dba0dfb7efbd959fb1a1f871 100644 (file)
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -49,9 +49,6 @@ ftp://www.example.com/moo/550 http://%HOSTIP:%HTTPPORT ascii
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET ftp://www.example.com/moo/550;type=a HTTP/1.1\r
 Host: www.example.com:21\r

diff --git a/tests/data/test551 b/tests/data/test551
index bb31a36f85eca10711471f33ec42801c9fa0a6f4..30c0ed940e6dd1984d4d8a473b6d6e3cf967c729 100644 (file)
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -75,9 +75,6 @@ http://test.remote.example.com/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 POST http://test.remote.example.com/path/551 HTTP/1.1\r
 Host: test.remote.example.com\r

diff --git a/tests/data/test552 b/tests/data/test552
index a02023a598fddc088f4813a688e4f5b67608b4b8..1177d9e1cf0f54d2cd4398d00fc0b25d975e8971 100644 (file)
Binary files a/tests/data/test552 and b/tests/data/test552 differ

diff --git a/tests/data/test553 b/tests/data/test553
index bd937f016a741941b72347d29663d4a73afa3940..8b2cc7f247190a540d395afa4f75730f8bf7e6b7 100644 (file)
--- a/tests/data/test553
+++ b/tests/data/test553
@@ -41,9 +41,6 @@ http://%HOSTIP:%HTTPPORT/path/553
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol nonewline="yes">
 POST /path/553 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test555 b/tests/data/test555
index ed8117f8fa2d38a3aef93033cab665027c51ee7f..506cbb4a04b87c06425101b36cb327945a7aca81 100644 (file)
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -105,13 +105,9 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
 <protocol>
 POST http://test.remote.example.com/path/555 HTTP/1.1\r
 Host: test.remote.example.com\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r
@@ -121,7 +117,6 @@ this is the blurb we want to upload
 POST http://test.remote.example.com/path/555 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 0\r
@@ -130,7 +125,6 @@ Content-Type: application/x-www-form-urlencoded
 POST http://test.remote.example.com/path/555 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 Content-Length: 36\r

diff --git a/tests/data/test556 b/tests/data/test556
index 549b9a4a2cbf6fbdfa60c1815ff4fcdfccc42f30..72a8b9e477d107f3a89122f212e2ee3197ab9d1f 100644 (file)
--- a/tests/data/test556
+++ b/tests/data/test556
@@ -38,9 +38,6 @@ http://%HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /556 HTTP/1.2\r
 Host: ninja\r

diff --git a/tests/data/test560 b/tests/data/test560
index 8d005541f2978d4eb9a7761b906c261abfa5aa6f..72a35e4b8457e46239e23434eaa629833670f782 100644 (file)
--- a/tests/data/test560
+++ b/tests/data/test560
@@ -43,9 +43,6 @@ https://%HOSTIP:%HTTPSPORT/560
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /560 HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r

diff --git a/tests/data/test561 b/tests/data/test561
index 359e54cca1abbef3e78bcfcbfdfcc31df4d99d94..2f244617cbd78fe0ec51424ab126ab12aeefd4af 100644 (file)
--- a/tests/data/test561
+++ b/tests/data/test561
@@ -50,9 +50,6 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET ftp://www.example.com/moo/561;type=i HTTP/1.1\r
 Host: www.example.com:21\r

diff --git a/tests/data/test57 b/tests/data/test57
index 0724eac822276a16dd043e3b01c2af4f000819c3..5011e6eb004f64951bfb405a0112848731f07e54 100644 (file)
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -35,12 +35,10 @@ HTTP content-type with spaces in
 <stdout mode="text">
 text/html; charset=ISO-8859-4
 </stdout>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /57 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test573 b/tests/data/test573
index e3299b8202491bae2712befeb0c54ef85e3866b3..b76f259c9de991930a5daf55315640357aae3e0c 100644 (file)
--- a/tests/data/test573
+++ b/tests/data/test573
@@ -45,9 +45,6 @@ http://%HOSTIP:%HTTPPORT/573
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /573 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test58 b/tests/data/test58
index 1bd53fa27520f0aa75adf92d69acdbc1416c3378..f2eafe23a53bdf2a809592c5fcbd10fbd0415ec6 100644 (file)
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -35,12 +35,10 @@ a few bytes
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /we/want/58te%5B%5Dst.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 12\r
 Expect: 100-continue\r

diff --git a/tests/data/test580 b/tests/data/test580
index 13965598f475d10c0b3a2ed9b167331be039f523..b448ee337cc814bc8978a0008d87d5d7afa340a4 100644 (file)
--- a/tests/data/test580
+++ b/tests/data/test580
@@ -45,9 +45,6 @@ http://%HOSTIP:%HTTPPORT/580
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /580 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test581 b/tests/data/test581
index 83d7b604ecd96626995a0c63883b48734b0edb32..92871c3e61c586ab160ddd12fd37af2dc31f7028 100644 (file)
--- a/tests/data/test581
+++ b/tests/data/test581
@@ -45,9 +45,6 @@ http://%HOSTIP:%HTTPPORT/581
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /581 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test585 b/tests/data/test585
index 2096e81c32db4a04de399b8da6bd2b7daeffd9e9..ecde4beb0f9ab6ce6e65ff0da6bc2464e95eace6 100644 (file)
--- a/tests/data/test585
+++ b/tests/data/test585
@@ -56,9 +56,6 @@ http://%HOSTIP:%HTTPPORT/585
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /585 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test589 b/tests/data/test589
index 451bb15bdaa69b5c92dacfb4d0d84e2518049450..81f788100118740bd93ba1d345fc083b4fc6cd6c 100644 (file)
--- a/tests/data/test589
+++ b/tests/data/test589
@@ -41,9 +41,6 @@ http://%HOSTIP:%HTTPPORT/589
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 POST /589 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test59 b/tests/data/test59
index 9c96017780fe734dc56ab9914ca7e1d5c4632052..b93f99d6ca8cbfda415cc1037ccb37bde9a523a4 100644 (file)
--- a/tests/data/test59
+++ b/tests/data/test59
@@ -34,12 +34,10 @@ HTTP URL with slash but with "parameter"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /?mooo/59 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test590 b/tests/data/test590
index 5ddc823a56b2b6e973675dbd0d9e4fc66f174147..cb24cbb5697aca026142d4e4b04c22e8d93f3155 100644 (file)
--- a/tests/data/test590
+++ b/tests/data/test590
@@ -98,27 +98,22 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent: curl/.*
-</strip>
+
 <protocol>
 GET http://test.remote.example.com/path/590 HTTP/1.1\r
 Host: test.remote.example.com\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.example.com/path/590 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://test.remote.example.com/path/590 HTTP/1.1\r
 Host: test.remote.example.com\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAgACAHAAAAAIAAgAcgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAIWYOdZV0iKA8ytf+dU+Bz9TpMJ4mBKu221lY3VybGhvc3Q=\r
-User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test6 b/tests/data/test6
index 0e7dc9b249a5f4a5e343de2e5bb062cd1abb3bf6..09664cdbb8d56138cfa7670c2a43bc7a69dd21cb 100644 (file)
--- a/tests/data/test6
+++ b/tests/data/test6
@@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/we/want/that/page/6 -b "name=contents;name2=content2"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/that/page/6 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: name=contents;name2=content2\r
 \r

diff --git a/tests/data/test60 b/tests/data/test60
index 0dd717f8db8ba627d89d81ed8efae4a1e785da15..09cd54f8393bd16ca506a6dceb0e1480b18ba5c6 100644 (file)
--- a/tests/data/test60
+++ b/tests/data/test60
@@ -37,12 +37,10 @@ more than one byte
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /bzz/60 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Transfer-Encoding: chunked\r
 Content-Length: 1\r

diff --git a/tests/data/test61 b/tests/data/test61
index 2bf6490f79daacc941cd567b231c3f58d7426e1b..67bee52e9a6f334b4baa4727b1ccb420ad86fff8 100644 (file)
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -51,12 +51,10 @@ http://%HOSTIP:%HTTPPORT/we/want/61 -c log/jar61.txt -H "Host: www.host.foo.com"
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/61 HTTP/1.1\r
 Host: www.host.foo.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test62 b/tests/data/test62
index 82bc0d783638f15559cc57005e9c32c445002d5a..03afba6c08ae14eb4b77b987cc57922bf4e64fa5 100644 (file)
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -46,17 +46,16 @@ http://%HOSTIP:%HTTPPORT/we/want/62 http://%HOSTIP:%HTTPPORT/we/want/62?hoge=fug
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/62 HTTP/1.1\r
 Host: www.host.foo.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: test2=yes; test=yes\r
 \r
 GET /we/want/62?hoge=fuga HTTP/1.1\r
 Host: www.host.foo.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: test2=yes; test=yes\r
 \r

diff --git a/tests/data/test63 b/tests/data/test63
index e7d7a4615c172702b594a703cfd90b2b3b07cf4f..b330c6afec71b208b94c5066d6b50f0bd676a91c 100644 (file)
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -40,13 +40,11 @@ proxy
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://we.want.that.site.com/63 HTTP/1.1\r
 Host: we.want.that.site.com\r
 Proxy-Authorization: Basic ZmFrZTp1c2Vy\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test64 b/tests/data/test64
index 804a6fa80790e003727c1026b4c3052ad8a3eddd..1e7a96eed95098665c9a88738590f4078304e669 100644 (file)
--- a/tests/data/test64
+++ b/tests/data/test64
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/64 -u testuser:testpass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /64 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /64 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/64", response="c55f7f30d83d774a3d2dcacf725abaca"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test65 b/tests/data/test65
index f0b9742136586799225f3d512858f74d4cf30b61..606523183f4ebf6b3a66af1a8d2ac842653ced9b 100644 (file)
--- a/tests/data/test65
+++ b/tests/data/test65
@@ -65,18 +65,16 @@ http://%HOSTIP:%HTTPPORT/65 -u testuser:test2pass --digest
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /65 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /65 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/65", response="66d68d3251f1839576ba7c766cf9205b"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test658 b/tests/data/test658
index 2ed6d6429a4184d432cbaa0518d3bd8688ef5ce0..acf1846a69073c5a3c09f871b0df5cceb96ee905 100644 (file)
--- a/tests/data/test658
+++ b/tests/data/test658
@@ -38,9 +38,6 @@ http://%HOSTIP:%HTTPPORT/658
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /658 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test659 b/tests/data/test659
index 048c0d0f241bbc519e544a78a1603951fbb10080..f191a8e89cbfdf0576d312b59cc5280802104d82 100644 (file)
--- a/tests/data/test659
+++ b/tests/data/test659
@@ -42,9 +42,6 @@ proxy
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://www.example.com:80/ HTTP/1.1\r
 Host: www.example.com\r

diff --git a/tests/data/test66 b/tests/data/test66
index 7b9af29538b650a741c9edc8da18141a6ab1dc94..23bb9e9c116980fa2447de1cd73d84df1a341cf0 100644 (file)
--- a/tests/data/test66
+++ b/tests/data/test66
@@ -29,12 +29,10 @@ http://%HOSTIP:%HTTPPORT/66 --http0.9
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /66 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test662 b/tests/data/test662
index 53d97c39d6898cb4d38d1c160b33d10fda078fb0..3140c61c1ec7a3ac7ea4c9bd635c0486e7bc7377 100644 (file)
--- a/tests/data/test662
+++ b/tests/data/test662
@@ -59,17 +59,16 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://example.com/please/gimme/662 HTTP/1.1\r
 Host: example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://example.net/tes%20t%20case=/6620002 HTTP/1.1\r
 Host: example.net\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test663 b/tests/data/test663
index c9c05a02d2c77f203c472174d1e8684400089bab..487be250310794265e5231019cc20741ada46e7a 100644 (file)
--- a/tests/data/test663
+++ b/tests/data/test663
@@ -63,17 +63,16 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://example.com/gimme/663?foobar HTTP/1.1\r
 Host: example.com\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://example.net/there/tes%20t%20case=/6630002?+yes+no HTTP/1.1\r
 Host: example.net\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test669 b/tests/data/test669
index 64cfc0659143e9b5008a1bb172261b82b1940fa6..47b974ca3aab962d202e48caaca8b251b8ee150b 100644 (file)
--- a/tests/data/test669
+++ b/tests/data/test669
@@ -34,17 +34,14 @@ http://%HOSTIP:%HTTPPORT/we/want/669 -H 'Content-type: multipart/form-data; char
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <strippart>
 s/^--------------------------[a-z0-9]*/------------------------------/
 s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
 </strippart>
 <protocol>
 POST /we/want/669 HTTP/1.1\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 242\r
 Content-Type: multipart/form-data; charset=utf-8; boundary=----------------------------\r

diff --git a/tests/data/test67 b/tests/data/test67
index c0ccaf8f8e95557735cbc57a219b7842ade43b1b..8138c7418b0a85fd11bb00bd3c2b32c4f91a1ca4 100644 (file)
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -82,20 +82,17 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /67 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /67 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test674 b/tests/data/test674
index d1f1a8654450a38b1d319c320ab938d346c4f6de..38ed39ef5f77336c2825cd44306e2f1de52c1e83 100644 (file)
--- a/tests/data/test674
+++ b/tests/data/test674
@@ -39,9 +39,6 @@ http://%HOSTIP:%HTTPPORT/674
 </client>
 
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /674 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r

diff --git a/tests/data/test68 b/tests/data/test68
index 1eaff6e7d35aac5c4cebd8f7f52e11ae23be660a..57ab2580ce3973ff24ac4630e15ce544e2cb88a1 100644 (file)
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -81,20 +81,17 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /68 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /68 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test69 b/tests/data/test69
index 309f0394af36af1cf8cc41ab9ff087d5a5a50a80..cc3178a6c0250ed6aa85d84f7465dfb2a197ec9b 100644 (file)
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -98,25 +98,22 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /69 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /69 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /69 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test7 b/tests/data/test7
index 62731de13027a973c33a2a6717901f737a51428d..317b235b9cee9fbb536fd7762d0170a1314857be 100644 (file)
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -38,12 +38,10 @@ http://%HOSTIP:%HTTPPORT/we/want/7 -b none -D log/heads7.txt
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/7 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test70 b/tests/data/test70
index 9057d6a4b7564afc9c533ac0cfe23076ed844c5f..7057153e95478509591830dce69bf16e0cedcd8e 100644 (file)
--- a/tests/data/test70
+++ b/tests/data/test70
@@ -68,19 +68,16 @@ http://%HOSTIP:%HTTPPORT/70 -u testuser:testpass --anyauth
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /70 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /70 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/70", response="2c9a6f00af0d86497b177b90e90c688a"\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test700 b/tests/data/test700
index ac63fa59af047323f35ef9cfbae82ea7d7107281..f43590db30e8f731b3d779eb742c011748c6ec15 100644 (file)
--- a/tests/data/test700
+++ b/tests/data/test700
@@ -44,12 +44,10 @@ HTTP GET via SOCKS4 proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /700 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test701 b/tests/data/test701
index 799597f3894fd03fe68ece7c779b9f6368a5d672..3b687ff01b210b0738e6e5d850eb53e68c9c3da1 100644 (file)
--- a/tests/data/test701
+++ b/tests/data/test701
@@ -44,12 +44,10 @@ HTTP GET via SOCKS5 proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /701 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test708 b/tests/data/test708
index e8bffc36536ef4a89bbd558404ab6faeefce8d37..85aa95ed45de10a81c252d6924789d84b578822a 100644 (file)
--- a/tests/data/test708
+++ b/tests/data/test708
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/708
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /708 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test709 b/tests/data/test709
index fa7fbc0176abab6da65244c0a22d28b8fac8c719..a2631521cbaa52b35c08e11503d4042a3455ff35 100644 (file)
--- a/tests/data/test709
+++ b/tests/data/test709
@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/709
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /709 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test710 b/tests/data/test710
index 884eb50a04ec6162ddd358e145b8b1f2ab6928e5..92df2f3580e15585aea37161c04a066fb292efa6 100644 (file)
--- a/tests/data/test710
+++ b/tests/data/test710
@@ -44,12 +44,10 @@ http://%HOSTIP:%HTTPPORT/710 --proxy socks5://%HOSTIP:%SOCKSPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /710 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test717 b/tests/data/test717
index dae50d9f21acae7f888f754f51d0cc9cecd23818..5de8fcb69438815addfd92db4ed656c8706239fb 100644 (file)
--- a/tests/data/test717
+++ b/tests/data/test717
@@ -55,12 +55,10 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /717 HTTP/1.1\r
 Host: %HOSTIP:1\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test72 b/tests/data/test72
index 8e3adaa50dd833b2c3000a4ff42c7cea242d6bb0..1160121b26e63dbe589de30e76763bb8ca1e1939 100644 (file)
--- a/tests/data/test72
+++ b/tests/data/test72
@@ -67,19 +67,16 @@ http://%HOSTIP:%HTTPPORT/72 -u testuser:testpass --anyauth
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /72 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /72 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/72", response="9fcd1330377365a09bbcb33b2cbb25bd"\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test73 b/tests/data/test73
index 70408a86584cb4a52c5f59a245a012c10ee79ca2..893377987e2d3d4788f64f18927e582d831a2aca 100644 (file)
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -35,12 +35,10 @@ http://%HOSTIP:%HTTPPORT/we/want/73 -c log/jar73.txt -H "Host: host.NOT_DISCLOSE
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/73 HTTP/1.1\r
 Host: host.NOT_DISCLOSED.se\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test74 b/tests/data/test74
index dbe0e9c1381a94e2d70cd5a47ae9177320e7f299..1a7d73fc357f7315c9fd9df1dc9a1d327dc74f76 100644 (file)
--- a/tests/data/test74
+++ b/tests/data/test74
@@ -50,16 +50,15 @@ HTTP, urlglob {}-retrieval and -o #[num] usage
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /74 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /740001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test75 b/tests/data/test75
index 62aeb119da2be03d8ae89104dc7465afbbc4fe52..7bee044435b6bab812a8fb991265601b286cd555 100644 (file)
--- a/tests/data/test75
+++ b/tests/data/test75
@@ -32,9 +32,6 @@ HTTP, urlglob retrieval with bad range
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <errorcode>
 3
 </errorcode>

diff --git a/tests/data/test76 b/tests/data/test76
index b6c47cd88a128199e60fa84e28c2c53f534c2383..fc4a30d03b31e0adc6b80959cd5fa3718499c0c1 100644 (file)
--- a/tests/data/test76
+++ b/tests/data/test76
@@ -29,9 +29,6 @@ http://%HOSTIP:%NOLISTENPORT/76/ -O
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <errorcode>
 23
 </errorcode>

diff --git a/tests/data/test77 b/tests/data/test77
index 6a92158c8df6361a733210867013fa53e01dd8da..81ea63720056e3af36f84e2b089b23e822b7e6c8 100644 (file)
--- a/tests/data/test77
+++ b/tests/data/test77
@@ -42,12 +42,10 @@ http://%HOSTIP:%HTTPPORT/77 -z "dec 12 12:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /77 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT\r
 \r

diff --git a/tests/data/test78 b/tests/data/test78
index 6768000b46cd8458aaad4d074d4d7fb7477a84b0..d7f7d0fb0cc93676dc23ab383aaba7952ab96e11 100644 (file)
--- a/tests/data/test78
+++ b/tests/data/test78
@@ -54,12 +54,10 @@ http://%HOSTIP:%HTTPPORT/78 -z "dec 12 11:00:00 1999 GMT"
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /78 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT\r
 \r

diff --git a/tests/data/test79 b/tests/data/test79
index 9bc83668178e03ea48b519c158e1fd20bff6da30..e967bae0f8a72fe5caa5a6cebb5fcc14662445c5 100644 (file)
--- a/tests/data/test79
+++ b/tests/data/test79
@@ -42,12 +42,10 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 -x %HOSTIP:%HTTPPORT
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/79 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test8 b/tests/data/test8
index 2fc19006097f8db5131a3a7bc7f2a236d121a373..02c6c0620494b91f2751630e6779ce5d42f0c5e3 100644 (file)
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -55,12 +55,10 @@ perl -e 'if ("%HOSTIP" !~ /\.0\.0\.1$/) {print "Test only works for HOSTIPs endi
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /we/want/8 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Cookie: name with space=is weird but; trailingspace=removed; cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes\r
 \r

diff --git a/tests/data/test80 b/tests/data/test80
index 3e61eddde5aec44d86f1a06988594e4623d98b41..26b74f78efd810f0b01cebf3082c8ac588fb2449 100644 (file)
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -63,14 +63,11 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT test.80:%HTTPPORT HTTP/1.0\r
 Host: test.80:%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
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
@@ -78,7 +75,7 @@ Proxy-Connection: Keep-Alive
 GET /we/want/that/page/80 HTTP/1.1\r
 Host: test.80:%HTTPPORT\r
 Authorization: Basic aWFtOm15c2VsZg==\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
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test81 b/tests/data/test81
index 29e558d9c42ae79f6e55bc738582cc6057dd3195..6a49125576ceed41df23037159481967a1bd962f 100644 (file)
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -82,21 +82,18 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test82 b/tests/data/test82
index 88d5da84dc1d8b6d6bbfb0b0d5cd8b8d58dc67dd..138c8ee40e7c2f7c8223f409ce411ed46ad48de7 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -41,14 +41,11 @@ http://%HOSTIP:%HTTPPORT/82 --proxy-user testuser:testpass -x http://%HOSTIP:%HT
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/82 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test83 b/tests/data/test83
index 400e0a0f3c5ba3cbcfd5bf96cf7e0fbe20b0341a..6d7446d18bf4430f9ca297dc3de074f4f0e93e9e 100644 (file)
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -60,13 +60,10 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT test.83:%HTTPPORT HTTP/1.1\r
 Host: test.83:%HTTPPORT\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
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
@@ -74,7 +71,7 @@ Proxy-Connection: Keep-Alive
 GET /we/want/that/page/83 HTTP/1.1\r
 Host: test.83:%HTTPPORT\r
 Authorization: Basic aWFtOm15OjtzZWxm\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
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test84 b/tests/data/test84
index 4cfde6dbb70dcb7a7de2bfad0c960d8f529321ec..37533e00d95474172475eabc426df3fadaa4fe50 100644 (file)
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -41,14 +41,11 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/we/want/that/page/84 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Basic aWFtOm15c2VsZg==\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
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test85 b/tests/data/test85
index 8b4cd6abcc6ea91a19bbcf81bab196c3941a7c76..ebdc3705243c37854eec18f2322d3296f118a17e 100644 (file)
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -44,15 +44,12 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/we/want/that/page/85 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
 Authorization: Basic aWFtOm15c2VsZg==\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
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test86 b/tests/data/test86
index a69509ae22f691ec6c7080e835494238bc4eb4a8..26b66c43132d206297735d4180fd80e33b0704f0 100644 (file)
--- a/tests/data/test86
+++ b/tests/data/test86
@@ -64,23 +64,20 @@ HTTP, urlglob []-retrieval and -o #[num] usage
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /860001 HTTP/1.1\r
-User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /860002 HTTP/1.1\r
-User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /860003 HTTP/1.1\r
-User-Agent: curl/7.10.7-pre4 (i686-pc-linux-gnu) libcurl/7.10.7-pre4 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test88 b/tests/data/test88
index e2d019c06e3ffe05734738babd8ab1bf9425e0c5..40b0e8f4d891e09415a3442a0cec9f2b59e1de65 100644 (file)
--- a/tests/data/test88
+++ b/tests/data/test88
@@ -75,19 +75,17 @@ four is the number of lines
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /88 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 0\r
 \r
 PUT /88 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/88", response="78a49fa53d0c228778297687d4168e71"\r
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r
 Expect: 100-continue\r

diff --git a/tests/data/test89 b/tests/data/test89
index fc620cb236729cdd603ea12c4092de0e5623172c..0537fa5d4626c7c7cc06f9ea75620692d59e8c46 100644 (file)
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -115,32 +115,29 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /89 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /89 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /you/890010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /you/890010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test9 b/tests/data/test9
index 53fe25eda4d96afd2980d4d724a8d5968e1c6b92..adef69419c72b9ab942926f42ee54e1d54db8b45 100644 (file)
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -40,12 +40,12 @@ bar
 # Verify data after the test has been "shot"
 <verify>
 <strip>
-^(User-Agent:|Content-Type: multipart/form-data;|------------).*
+^(Content-Type: multipart/form-data;|------------).*
 </strip>
 <protocol>
 POST /we/want/9 HTTP/1.1\r
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 407\r
 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763\r

diff --git a/tests/data/test90 b/tests/data/test90
index d40b5a57118283628d2b1ccef1216988b6233852..91d569d08ab87038d744c9eb28cdfb048fd6958d 100644 (file)
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -153,40 +153,39 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /90 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /90 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /90 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /you/900010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /you/900010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /you/900010 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q=\r
-User-Agent: curl/7.10.8-pre1 (i686-pc-linux-gnu) libcurl/7.10.8-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3 GSS\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test91 b/tests/data/test91
index 4942bfddfe82442f96b7efb9f55ebee53175e00a..314a655148edb5b352cda1b62f3eb8ec274c3aa3 100644 (file)
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -99,25 +99,22 @@ chkhostname curlhost
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /91 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /91 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /91 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAAIAAgAfgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAKBS3rdGYZEGsqW8otYHWXWBxC5mCuFmYm15ZG9tYWlubXlzZWxmY3VybGhvc3Q=\r
-User-Agent: curl/7.10.6-pre1 (i686-pc-linux-gnu) libcurl/7.10.6-pre1 OpenSSL/0.9.7a ipv6 zlib/1.1.3\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test92 b/tests/data/test92
index 728d271b078c9bf9e9ae246649dd8475cd541dd9..7e03f0a1292f142320149cbaf1efafd50ec76bc8 100644 (file)
--- a/tests/data/test92
+++ b/tests/data/test92
@@ -54,13 +54,11 @@ http://%HOSTIP:%HTTPPORT/want/92 -C 87
 
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /want/92 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=87-\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test93 b/tests/data/test93
index 58e47bc6bc71002d0b999c3a2305225a403b0ef6..684e56cd490c65ddb4e597b10e022e023efb4d33 100644 (file)
--- a/tests/data/test93
+++ b/tests/data/test93
@@ -39,12 +39,10 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/93 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test94 b/tests/data/test94
index 4ca53c63b820f3088b1b7df5f913dec9ca719f93..6d54e78703b6a15ecf00bbec754bfc457a5dc504 100644 (file)
--- a/tests/data/test94
+++ b/tests/data/test94
@@ -45,13 +45,10 @@ https://test.anything.really.com:94 --proxy1.0 %HOSTIP:%HTTPPORT
 <errorcode>
 56
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 CONNECT test.anything.really.com:94 HTTP/1.0\r
-User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4\r
 Host: test.anything.really.com:94\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>

diff --git a/tests/data/test95 b/tests/data/test95
index afc00aedece6dfa800be7308873edf08c10ce293..0b16c3cd1284c54009bc9066dc283780f72b9208 100644 (file)
--- a/tests/data/test95
+++ b/tests/data/test95
@@ -60,20 +60,17 @@ proxy
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <proxy>
 CONNECT test.95:%HTTPPORT HTTP/1.1\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
 Host: test.95:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol nonewline="yes">
 POST /we/want/that/page/95 HTTP/1.1\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
 Host: test.95:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 27\r
 Content-Type: application/x-www-form-urlencoded\r

diff --git a/tests/data/test97 b/tests/data/test97
index c1065bb196b7b857abde4cc9d9a5b844f70299bc..d76941196dbbd37803f974846507a5b1ee98b639 100644 (file)
--- a/tests/data/test97
+++ b/tests/data/test97
@@ -36,12 +36,10 @@ HTTP POST with custom content-type
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol nonewline="yes">
 POST /97 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Type: silly/type\r
 Content-Length: 14\r

diff --git a/tests/data/test970 b/tests/data/test970
index bc5af5ba7e3e682a33959d7ed76e54b7c4b9fa2d..ab1fc53a64b0d7b78cd0a31d46723e8b58e9449f 100644 (file)
--- a/tests/data/test970
+++ b/tests/data/test970
@@ -51,12 +51,10 @@ http://%HOSTIP:%HTTPPORT/970 --write-out '%{json}' -o log/out970
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /970 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test98 b/tests/data/test98
index b6d1182c665c518ff5338ecd02e9dffeb47c6914..ef0cded2ffcd9f5ebd1059bebb5f95669d5e3973 100644 (file)
--- a/tests/data/test98
+++ b/tests/data/test98
@@ -39,12 +39,10 @@ data on stdin
 #
 # Verify data after the test has been "shot"
 <verify>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 PUT /98 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 14\r
 Expect: 100-continue\r

diff --git a/tests/data/test99 b/tests/data/test99
index 9797600cf501d0db93de551945a9cfbf5a5ee3b7..2bbee7809e620b86feccc580de1ebba02d76594c 100644 (file)
--- a/tests/data/test99
+++ b/tests/data/test99
@@ -55,13 +55,11 @@ http://%HOSTIP:%HTTPPORT/99 -C 9999999999
 <errorcode>
 33
 </errorcode>
-<strip>
-^User-Agent:.*
-</strip>
 <protocol>
 GET /99 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
 Range: bytes=9999999999-\r
+User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 3255221827dd5c157a734f0421fab1aec8f68115..6a08e14e0e773f3c9d2fbf8f067798f890d55a39 100755 (executable)
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -163,6 +163,7 @@ my $TELNETPORT=$noport;  # TELNET server port with negotiation
 my $HTTPUNIXPATH;        # HTTP server Unix domain socket path
 
 my $SSHSRVMD5 = "[uninitialized]"; # MD5 of ssh server public key
+my $VERSION;             # curl's reported version number
 
 my $srcdir = $ENV{'srcdir'} || '.';
 my $CURL="../src/curl".exe_ext('TOOL'); # what curl executable to run on the tests
@@ -2863,8 +2864,9 @@ sub checksystem {
     for(@version) {
         chomp;
 
-        if($_ =~ /^curl/) {
+        if($_ =~ /^curl ([^ ]*)/) {
             $curl = $_;
+            $VERSION = $1;
             $curl =~ s/^(.*)(libcurl.*)/$1/g;
 
             $libcurl = $2;
@@ -3261,6 +3263,7 @@ sub subVariables {
     $$thing =~ s/${prefix}CURL/$CURL/g;
     $$thing =~ s/${prefix}PWD/$pwd/g;
     $$thing =~ s/${prefix}POSIX_PWD/$posix_pwd/g;
+    $$thing =~ s/${prefix}VERSION/$VERSION/g;
 
     my $file_pwd = $pwd;
     if($file_pwd !~ /^\//) {