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
2025-01-18 14:04:30 +08:00 · 2020-10-02 13:45:24 +02:00 · 2020-10-02 13:45:24 +02:00 · e6b21d422e
commit e6b21d422e
parent 26a7d51c21
621 changed files with 852 additions and 2003 deletions
--- 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>`

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 78
 Expect: 100-continue
--- 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
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
-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
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
@ -97,6 +94,7 @@ GET http://%HOSTIP:%HTTPPORT/1001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1001", response="6af4d89c952f4dd4cc215a6878dc499d"
 Content-Range: bytes 2-4/5
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 3
--- 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
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
-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
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
@ -96,6 +93,7 @@ GET http://%HOSTIP:%HTTPPORT/1002.upload1 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload1", response="198aa9b6acb4b0c71d02a197a5e41f54"
 Content-Range: bytes 2-4/5
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 3
@ -105,7 +103,7 @@ st
 GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 2-4/5
-User-Agent: curl/7.16.1
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
@ -114,7 +112,7 @@ GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload2", response="d711f0d2042786d930de635ba0d1a1d0"
 Content-Range: bytes 2-4/5
-User-Agent: curl/7.16.1
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 3
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: test.remote.example.com.1008:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 CONNECT test.remote.example.com.1008:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.1008:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 GET /path/10080002 HTTP/1.1
-User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
 Host: test.remote.example.com.1008:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 [DISCONNECT]
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded

 mooGET /blah/moo.html&testcase=/10110002 HTTP/1.1
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded

 mooPOST /blah/moo.html&testcase=/10120002 HTTP/1.1
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
--- 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
-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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 133
 Content-Type: application/x-www-form-urlencoded
--- 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
 Host: test.remote.example.com.1021:%HTTPPORT
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.1021:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 CONNECT test.remote.example.com.1021:%HTTPPORT HTTP/1.1
 Host: test.remote.example.com.1021:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 GET /path/10210002 HTTP/1.1
-User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
 Host: test.remote.example.com.1021:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /data/10240002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /want/10240003.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Cookie: firstcookie=want

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Cookie: forcedcookie=yes

 GET /data/10250002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Cookie: forcedcookie=yes

 GET /want/10250003.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Cookie: firstcookie=want; forcedcookie=yes

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 USER anonymous
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
@ -96,7 +94,7 @@ four is the number of lines
 PUT /1030 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1030", response="01cb59db1ddaac246b072d5f5f0716d9"
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /want/this/1031?coolsite=yes/10310002.txt HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=1-3
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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>
--- 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
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=100-
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
 Content-Range: bytes 0-99/100
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 100
 Expect: 100-continue
--- 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
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=200-
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=40-
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 78
 Expect: 100-continue
@ -100,6 +98,7 @@ the
      feature
 PUT /want/data/10510002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 78
 Expect: 100-continue
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 78

@ -94,6 +92,7 @@ the
      feature
 PUT /want/data/10520002.txt?coolsite=yes HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 78

--- 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
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 410
 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
@ -99,8 +99,8 @@ bar

 ------------------------------9ef8d6205763--
 POST /we/want/data/10530002.txt?coolsite=yes HTTP/1.1
-User-Agent: curl/7.18.2 (i686-pc-linux-gnu) libcurl/7.18.2 OpenSSL/0.9.7a ipv6 zlib/1.1.4
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 410
 Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 10
 Content-Type: application/x-www-form-urlencoded

 field=dataPOST /blah/moo/testcase/10540002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 10
 Content-Type: application/x-www-form-urlencoded
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 78
 Expect: 100-continue
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /moo/10560002 HTTP/1.1
 Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=-101
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: test-number:1059
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 </protocol>
--- 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
 Host: test.remote.haxx.se.1060:8990
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 CONNECT test.remote.haxx.se.1060:8990 HTTP/1.1
 Host: test.remote.haxx.se.1060:8990
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1060:8990", response="e1fbed39c26f4efe284adc0e576ff638"
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 GET /path/10600002 HTTP/1.1
 Host: test.remote.haxx.se.1060:8990
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: test.remote.haxx.se.1061:8990
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 CONNECT test.remote.haxx.se.1061:8990 HTTP/1.1
 Host: test.remote.haxx.se.1061:8990
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.1061:8990", response="4e23449fa93224834299e7282a70472c"
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 GET /path/10610002 HTTP/1.1
 Host: test.remote.haxx.se.1061:8990
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 5

 test
 PUT /10640002.upload2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 5

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 5

 test
 GET /10650002.url2 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /want/10660001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Referer: firstone.html

 GET /want/data/10670002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Referer: http://%HOSTIP:%HTTPPORT/want/1067

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Transfer-Encoding: chunked
 Expect: 100-continue
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Expect: 100-continue
 Content-Length: 2313
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
@ -102,6 +100,7 @@ four is the number of lines
 PUT /1071 HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1071", response="df4cef6b52a30e65d472dd848d2055a1"
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Transfer-Encoding: chunked
 Expect: 100-continue
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Transfer-Encoding: chunked
 Expect: 100-continue
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /wantmore/10740001 HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
@ -81,6 +79,7 @@ four is the number of lines
 PUT /1075 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 85
 Expect: 100-continue
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded

 mooPOST /blah/moo.html&testcase=/10760002 HTTP/1.1
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 3
 Content-Type: application/x-www-form-urlencoded
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

 GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/10770002 HTTP/1.0
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

--- 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
 Host: %HOSTIP.1078:%HTTPPORT
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 </proxy>
 <protocol>
 GET /we/want/that/page/1078 HTTP/1.1
 Host: %HOSTIP.1078:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /we/want/that/page/1078 HTTP/1.0
 Host: %HOSTIP.1078:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /1079 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1079", response="e340c7cdca0950462070f46ee139e9f7"
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /we/want/our/1080 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /we/want/our/10810002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOST6IP:%HTTP6PORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: first.host.it.is
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

 GET http://first.host.it.is/we/want/that/page/10871000 HTTP/1.1
 Host: first.host.it.is
 Authorization: Basic aWFtOm15c2VsZg==
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

 GET http://goto.second.host.now/10871002 HTTP/1.1
 Host: goto.second.host.now
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

--- 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
 Host: first.host.it.is
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

 GET http://first.host.it.is/we/want/that/page/10881000 HTTP/1.1
 Host: first.host.it.is
 Authorization: Basic aWFtOm15c2VsZg==
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

 GET http://goto.second.host.now/10881002 HTTP/1.1
 Host: goto.second.host.now
 Authorization: Basic aWFtOm15c2VsZg==
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /10890001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /10900001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /1095 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/1095", response="a1c7931ece9e8617bae2715045e4f49f"
-User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: test.a.galaxy.far.far.away.1097:%HTTPPORT
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-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
+User-Agent: curl/%VERSION
 Proxy-Connection: Keep-Alive

 POST /1097 HTTP/1.1
-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
 Host: test.a.galaxy.far.far.away.1097:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 11
 Content-Type: application/x-www-form-urlencoded
--- 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
 Host: ftp-site:21
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

 GET ftp://ftp-site/moo/1098 HTTP/1.1
 Host: ftp-site:21
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 GET /want/data/110002.txt?coolsite=yes HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-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
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
@ -104,14 +100,14 @@ Content-Type: application/x-www-form-urlencoded
 POST /1100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-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
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 18
 Content-Type: application/x-www-form-urlencoded

 stuff to send awayGET /1100 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-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
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjpzZWNyZXQ=
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

 GET http://%HOSTIP:%HTTPPORT/want/data/11040002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive
 Cookie: test2=true
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 33
 Content-Type: application/x-www-form-urlencoded
--- 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
 Host: %HOSTIP:23456
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=10-22
+User-Agent: curl/%VERSION
 Accept: */*

 GET /wantmore/11170001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Range: bytes=10-22
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: host1
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Connection: TE
 TE: gzip
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Connection: TE
 TE: gzip
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Connection: TE
 TE: gzip
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Connection: close, TE
 TE: gzip
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT

 GET /11280001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 1053700
 Content-Type: application/x-www-form-urlencoded
@ -87,6 +85,7 @@ Expect: 100-continue

 POST /11290001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 1053700
 Content-Type: application/x-www-form-urlencoded
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Expect: 100-continue
 Content-Length: 100
@ -87,6 +85,7 @@ Content-Type: application/x-www-form-urlencoded

 POST /11300001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Expect: 100-continue
 Content-Length: 100
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 100
 Expect: 100-continue

 PUT /11310001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 100
 Expect: 100-continue
--- 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
-User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Content-Length: 1264
 Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32
--- 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
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic dXNlcjE6cGFzc3dvcmQx
+User-Agent: curl/%VERSION
 Accept: */*

 GET /11340001 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
 Authorization: Basic MnVzZXI6cGFzc3dvcmQy
+User-Agent: curl/%VERSION
 Accept: */*

 [DISCONNECT]
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 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
-User-Agent: curl/7.10 (i686-pc-linux-gnu) libcurl/7.10 OpenSSL/0.9.6c ipv6 zlib/1.1.3
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

 GET http://foo.example.com/want/11410001 HTTP/1.1
 Host: foo.example.com
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: test.remote.example.com.1150:150
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

 GET http://test.remote.example.com.1150:1234/path/ HTTP/1.1
 Host: test.remote.example.com.1150:1234
+User-Agent: curl/%VERSION
 Accept: */*
 Proxy-Connection: Keep-Alive

--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- 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
 Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/%VERSION
 Accept: */*

 </protocol>
--- a/Show More
+++ b/Show More