← Commit list

e6b21d422e

Daniel Stenberg

2020-10-02

SUCCESS Duration: 130s

Subject

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

Binary

Download Binary (686 KB)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

$ git checkout -f e6b21d422e631a7c0cc81abf956af179b3b4c5e8
Previous HEAD position was 6497ed45bd ldap: reduce the amount of #ifdefs needed
HEAD is now at e6b21d422e runtests: provide curl's version string as %VERSION for tests

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/curl.1
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/curl-curl_ctype.o
Removing lib/curl-curl_multibyte.o
Removing lib/curl-dynbuf.o
Removing lib/curl-nonblock.o
Removing lib/curl-strtoofft.o
Removing lib/curl-version_win32.o
Removing lib/curl-warnless.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_ctype.lo
Removing lib/libcurl_la-curl_ctype.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dotdot.lo
Removing lib/libcurl_la-dotdot.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostcheck.lo
Removing lib/libcurl_la-hostcheck.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn_win32.lo
Removing lib/libcurl_la-idn_win32.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-non-ascii.lo
Removing lib/libcurl_la-non-ascii.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-wildcard.lo
Removing lib/libcurl_la-wildcard.o
Removing lib/libcurl_la-x509asn1.lo
Removing lib/libcurl_la-x509asn1.o
Removing lib/stamp-h1
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-ngtcp2.lo
Removing lib/vquic/libcurl_la-ngtcp2.o
Removing lib/vquic/libcurl_la-quiche.lo
Removing lib/vquic/libcurl_la-quiche.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-gskit.lo
Removing lib/vtls/libcurl_la-gskit.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-mesalink.lo
Removing lib/vtls/libcurl_la-mesalink.o
Removing lib/vtls/libcurl_la-nss.lo
Removing lib/vtls/libcurl_la-nss.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/curl-slist_wc.o
Removing src/curl-tool_binmode.o
Removing src/curl-tool_bname.o
Removing src/curl-tool_cb_dbg.o
Removing src/curl-tool_cb_hdr.o
Removing src/curl-tool_cb_prg.o
Removing src/curl-tool_cb_rea.o
Removing src/curl-tool_cb_see.o
Removing src/curl-tool_cb_wrt.o
Removing src/curl-tool_cfgable.o
Removing src/curl-tool_convert.o
Removing src/curl-tool_dirhie.o
Removing src/curl-tool_doswin.o
Removing src/curl-tool_easysrc.o
Removing src/curl-tool_filetime.o
Removing src/curl-tool_formparse.o
Removing src/curl-tool_getparam.o
Removing src/curl-tool_getpass.o
Removing src/curl-tool_help.o
Removing src/curl-tool_helpers.o
Removing src/curl-tool_homedir.o
Removing src/curl-tool_hugehelp.o
Removing src/curl-tool_libinfo.o
Removing src/curl-tool_main.o
Removing src/curl-tool_metalink.o
Removing src/curl-tool_msgs.o
Removing src/curl-tool_operate.o
Removing src/curl-tool_operhlp.o
Removing src/curl-tool_panykey.o
Removing src/curl-tool_paramhlp.o
Removing src/curl-tool_parsecfg.o
Removing src/curl-tool_progress.o
Removing src/curl-tool_setopt.o
Removing src/curl-tool_sleep.o
Removing src/curl-tool_strdup.o
Removing src/curl-tool_urlglob.o
Removing src/curl-tool_util.o
Removing src/curl-tool_vms.o
Removing src/curl-tool_writeout.o
Removing src/curl-tool_writeout_json.o
Removing src/curl-tool_xattr.o
Removing src/tool_hugehelp.c
Removing test-driver
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in

$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:44: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:44: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:147: CURL_CHECK_OPTION_DEBUG is expanded from...
configure.ac:44: the top level
configure.ac:45: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:45: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:181: CURL_CHECK_OPTION_OPTIMIZE is expanded from...
configure.ac:45: the top level
configure.ac:46: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:46: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:360: CURL_CHECK_OPTION_WARNINGS is expanded from...
configure.ac:46: the top level
configure.ac:47: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:47: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:394: CURL_CHECK_OPTION_WERROR is expanded from...
configure.ac:47: the top level
configure.ac:48: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:48: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:94: CURL_CHECK_OPTION_CURLDEBUG is expanded from...
configure.ac:48: the top level
configure.ac:49: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:49: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:237: CURL_CHECK_OPTION_SYMBOL_HIDING is expanded from...
configure.ac:49: the top level
configure.ac:50: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:50: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:58: CURL_CHECK_OPTION_ARES is expanded from...
configure.ac:50: the top level
configure.ac:51: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:51: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:328: CURL_CHECK_OPTION_RT is expanded from...
configure.ac:51: the top level
configure.ac:52: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:52: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:658: CURL_CHECK_OPTION_ECH is expanded from...
configure.ac:52: the top level
configure.ac:123: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:123: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-functions.m4:7304: CURL_COVERAGE is expanded from...
configure.ac:123: the top level
configure.ac:376: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:376: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:376: the top level
configure.ac:377: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:377: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:377: the top level
configure.ac:395: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:395: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:395: the top level
configure.ac:396: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:396: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:396: the top level
configure.ac:410: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:410: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:410: the top level
configure.ac:411: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:411: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:411: the top level
configure.ac:425: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:425: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:425: the top level
configure.ac:426: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:426: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:426: the top level
configure.ac:441: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:441: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:441: the top level
configure.ac:442: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:442: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:442: the top level
configure.ac:473: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:473: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:473: the top level
configure.ac:474: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:474: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:474: the top level
configure.ac:499: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:499: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:499: the top level
configure.ac:500: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:500: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:500: the top level
configure.ac:516: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:516: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:516: the top level
configure.ac:517: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:517: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:517: the top level
configure.ac:531: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:531: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:531: the top level
configure.ac:532: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:532: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:532: the top level
configure.ac:546: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:546: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:546: the top level
configure.ac:547: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:547: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:547: the top level
configure.ac:562: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:562: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:562: the top level
configure.ac:563: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:563: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:563: the top level
configure.ac:579: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:579: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:579: the top level
configure.ac:580: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:580: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:580: the top level
configure.ac:596: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:596: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:596: the top level
configure.ac:597: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:597: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:597: the top level
configure.ac:612: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:612: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:612: the top level
configure.ac:613: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:613: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:613: the top level
configure.ac:628: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:628: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:628: the top level
configure.ac:629: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:629: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:629: the top level
configure.ac:644: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:644: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:644: the top level
configure.ac:645: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:645: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:645: the top level
configure.ac:664: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:664: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:664: the top level
configure.ac:665: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:665: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:665: the top level
configure.ac:685: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:685: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:685: the top level
configure.ac:686: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:686: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:686: the top level
configure.ac:705: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:705: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:705: the top level
configure.ac:912: warning: The macro `AC_HEADER_TIME' is obsolete.
configure.ac:912: You should run autoupdate.
./lib/autoconf/headers.m4:743: AC_HEADER_TIME is expanded from...
acinclude.m4:1575: CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC is expanded from...
acinclude.m4:1618: CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC is expanded from...
configure.ac:912: the top level
configure.ac:933: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:933: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:933: the top level
configure.ac:934: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:934: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:934: the top level
configure.ac:1040: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1040: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1040: the top level
configure.ac:1041: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1041: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1041: the top level
configure.ac:1126: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1126: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1126: the top level
configure.ac:1127: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1127: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1127: the top level
configure.ac:1212: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1212: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1212: the top level
configure.ac:1217: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1217: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1217: the top level
configure.ac:1298: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1298: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1298: the top level
configure.ac:1299: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1299: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1299: the top level
configure.ac:1310: warning: The macro `AC_TRY_RUN' is obsolete.
configure.ac:1310: You should run autoupdate.
./lib/autoconf/general.m4:2997: AC_TRY_RUN is expanded from...
configure.ac:1310: the top level
configure.ac:1348: warning: The macro `AC_TRY_COMPILE' is obsolete.
configure.ac:1348: You should run autoupdate.
./lib/autoconf/general.m4:2847: AC_TRY_COMPILE is expanded from...
configure.ac:1348: the top level
configure.ac:1409: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1409: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1409: the top level
configure.ac:1416: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1416: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1416: the top level
configure.ac:1423: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1423: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1423: the top level
configure.ac:1589: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1589: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1589: the top level
configure.ac:1590: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1590: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1590: the top level
configure.ac:1616: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1616: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1616: the top level
configure.ac:1617: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1617: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1617: the top level
configure.ac:1621: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1621: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1621: the top level
configure.ac:1622: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1622: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1622: the top level
configure.ac:1651: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1651: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1651: the top level
configure.ac:1652: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1652: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1652: the top level
configure.ac:1656: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1656: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1656: the top level
configure.ac:1657: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1657: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1657: the top level
configure.ac:1681: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1681: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1681: the top level
configure.ac:1682: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1682: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1682: the top level
configure.ac:1717: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1717: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1717: the top level
configure.ac:1718: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1718: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1718: the top level
configure.ac:1736: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:1736: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
configure.ac:1736: the top level
configure.ac:1828: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:1828: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
configure.ac:1828: the top level
configure.ac:1828: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:1828: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/general.m4:2894: _AC_LINK_IFELSE is expanded from...
./lib/autoconf/general.m4:2911: AC_LINK_IFELSE is expanded from...
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
configure.ac:1828: the top level
configure.ac:2044: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2044: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2044: the top level
configure.ac:2055: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2055: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2055: the top level
configure.ac:2090: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2090: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2090: the top level
configure.ac:2091: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2091: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2091: the top level
configure.ac:2107: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2107: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2107: the top level
configure.ac:2108: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2108: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2108: the top level
configure.ac:2268: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2268: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2268: the top level
configure.ac:2269: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2269: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2269: the top level
configure.ac:2362: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2362: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2362: the top level
configure.ac:2363: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2363: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2363: the top level
configure.ac:2522: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2522: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2522: the top level
configure.ac:2523: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2523: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2523: the top level
configure.ac:2613: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2613: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2613: the top level
configure.ac:2614: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2614: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2614: the top level
configure.ac:2704: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2704: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2704: the top level
configure.ac:2705: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2705: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2705: the top level
configure.ac:2870: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2870: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
acinclude.m4:2163: CURL_CHECK_CA_BUNDLE is expanded from...
configure.ac:2870: the top level
configure.ac:2901: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2901: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2901: the top level
configure.ac:2902: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2902: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2902: the top level
configure.ac:2995: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2995: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2995: the top level
configure.ac:2996: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2996: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2996: the top level
configure.ac:3002: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3002: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3002: the top level
configure.ac:3003: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3003: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3003: the top level
configure.ac:3008: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3008: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3008: the top level
configure.ac:3009: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3009: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3009: the top level
configure.ac:3189: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3189: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3189: the top level
configure.ac:3190: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3190: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3190: the top level
configure.ac:3268: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3268: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3268: the top level
configure.ac:3269: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3269: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3269: the top level
configure.ac:3320: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3320: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3320: the top level
configure.ac:3321: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3321: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3321: the top level
configure.ac:3398: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3398: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3398: the top level
configure.ac:3399: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3399: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3399: the top level
configure.ac:3533: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3533: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3533: the top level
configure.ac:3534: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3534: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3534: the top level
configure.ac:3620: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3620: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3620: the top level
configure.ac:3621: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3621: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3621: the top level
configure.ac:3819: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3819: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3819: the top level
configure.ac:3820: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3820: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3820: the top level
configure.ac:3910: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3910: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3910: the top level
configure.ac:3911: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3911: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3911: the top level
configure.ac:3994: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3994: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3994: the top level
configure.ac:3995: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3995: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3995: the top level
configure.ac:4019: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4019: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4019: the top level
configure.ac:4020: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4020: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4020: the top level
configure.ac:4048: warning: The macro `AC_HEADER_STDC' is obsolete.
configure.ac:4048: You should run autoupdate.
./lib/autoconf/headers.m4:704: AC_HEADER_STDC is expanded from...
configure.ac:4048: the top level
configure.ac:4135: warning: The macro `AC_HEADER_TIME' is obsolete.
configure.ac:4135: You should run autoupdate.
./lib/autoconf/headers.m4:743: AC_HEADER_TIME is expanded from...
configure.ac:4135: the top level
configure.ac:4250: warning: The macro `AC_TYPE_SIGNAL' is obsolete.
configure.ac:4250: You should run autoupdate.
./lib/autoconf/types.m4:776: AC_TYPE_SIGNAL is expanded from...
configure.ac:4250: the top level
configure.ac:4430: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4430: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:32: CURL_CHECK_OPTION_THREADED_RESOLVER is expanded from...
configure.ac:4430: the top level
configure.ac:4438: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4438: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4438: the top level
configure.ac:4440: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4440: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4440: the top level
configure.ac:4539: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4539: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4539: the top level
configure.ac:4540: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4540: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4540: the top level
configure.ac:4558: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4558: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4558: the top level
configure.ac:4559: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4559: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4559: the top level
configure.ac:4594: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4594: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4594: the top level
configure.ac:4595: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4595: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4595: the top level
configure.ac:4608: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4608: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:599: CURL_CHECK_OPTION_NTLM_WB is expanded from...
configure.ac:4608: the top level
configure.ac:4617: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4617: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4617: the top level
configure.ac:4618: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4618: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4618: the top level
configure.ac:4643: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4643: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4643: the top level
configure.ac:4644: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4644: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4644: the top level
configure.ac:4676: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4676: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4676: the top level
configure.ac:4677: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4677: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4677: the top level
configure.ac:4694: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4694: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4694: the top level
configure.ac:4695: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4695: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4695: the top level
configure.ac:4712: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4712: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4712: the top level
configure.ac:4713: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4713: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4713: the top level
configure.ac:4730: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4730: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4730: the top level
configure.ac:4731: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4731: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4731: the top level
configure.ac:4748: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4748: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4748: the top level
configure.ac:4749: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4749: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4749: the top level
configure.ac:4766: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4766: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4766: the top level
configure.ac:4767: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4767: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4767: the top level
configure.ac:4784: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4784: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4784: the top level
configure.ac:4785: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4785: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4785: the top level
configure.ac:4802: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4802: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4802: the top level
configure.ac:4803: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4803: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4803: the top level
configure.ac:4820: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4820: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4820: the top level
configure.ac:4821: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4821: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4821: the top level
configure.ac:4838: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4838: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4838: the top level
configure.ac:4839: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4839: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4839: the top level
configure.ac:4857: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4857: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4857: the top level
configure.ac:4858: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4858: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4858: the top level
configure.ac:120: installing './compile'
configure.ac:180: installing './config.guess'
configure.ac:180: installing './config.sub'
configure.ac:120: installing './install-sh'
configure.ac:125: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'

$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;

$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 7.73.0-DEV
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for sys/time.h... yes
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for inline... inline
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking if compiler is LCC... no
checking if compiler is SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking if compiler is Watcom C... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration 
checking if compiler accepts debug disabling options... yes
configure: compiler options added: 
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers -Wenum-conversion 
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking for windows.h... no
checking whether build target is a native Windows one... no
checking whether build target supports WIN32 file API... no
checking for good-to-use Mac CFLAGS... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking for windows.h... (cached) no
checking for winsock.h... (cached) no
checking for winsock2.h... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldapssl.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS (Windows native builds only)... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL)... no
checking for library containing psl_builtin... -lpsl
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libngtcp2 options with pkg-config... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for quiche options with pkg-config... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for fish options with pkg-config... no
checking for egrep... (cached) /usr/bin/grep -E
checking for malloc.h... yes
checking for memory.h... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for sys/uio.h... yes
checking for assert.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for sgtty.h... yes
checking for fcntl.h... yes
checking for alloca.h... yes
checking for time.h... (cached) yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for errno.h... yes
checking for stdbool.h... yes
checking for arpa/tftp.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for compiler support of C99 variadic macro style... yes
checking for compiler support of old gcc variadic macro style... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of short... 2
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking for long long... yes
checking if numberLL works... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for signal.h... yes
checking for sig_atomic_t... yes
checking if sig_atomic_t is already defined as volatile... no
checking return type of signal handlers... void
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking types of args and return type for select... int,fd_set *,struct timeval *,int
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking types of args and return type for recv... int,void *,size_t,int,ssize_t
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking types of args and return type for send... int,const void *,size_t,int,ssize_t
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for string.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking if connect can be linked... yes
checking if connect is prototyped... yes
checking if connect is compilable... yes
checking if connect usage allowed... yes
checking if connect might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for ws2tcpip.h... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if freeifaddrs can be linked... yes
checking if freeifaddrs is prototyped... yes
checking if freeifaddrs is compilable... yes
checking if freeifaddrs usage allowed... yes
checking if freeifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking for stdlib.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gai_strerror can be linked... yes
checking if gai_strerror is prototyped... yes
checking if gai_strerror is compilable... yes
checking if gai_strerror usage allowed... yes
checking if gai_strerror might be used... yes
checking if gethostbyaddr can be linked... yes
checking if gethostbyaddr is prototyped... yes
checking if gethostbyaddr is compilable... yes
checking if gethostbyaddr usage allowed... yes
checking if gethostbyaddr might be used... yes
checking if gethostbyaddr_r can be linked... yes
checking if gethostbyaddr_r is prototyped... yes
checking if gethostbyaddr_r takes 5 args.... no
checking if gethostbyaddr_r takes 7 args.... no
checking if gethostbyaddr_r takes 8 args.... yes
checking if gethostbyaddr_r is compilable... yes
checking if gethostbyaddr_r usage allowed... yes
checking if gethostbyaddr_r might be used... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking if getservbyport_r can be linked... yes
checking if getservbyport_r is prototyped... yes
checking if getservbyport_r takes 4 args.... no
checking if getservbyport_r takes 5 args.... no
checking if getservbyport_r takes 6 args.... yes
checking if getservbyport_r is compilable... yes
checking if getservbyport_r usage allowed... yes
checking if getservbyport_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntoa_r can be linked... no
checking if inet_ntoa_r might be used... no
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if localtime_r can be linked... yes
checking if localtime_r is prototyped... yes
checking if localtime_r is compilable... yes
checking if localtime_r seems to work... yes
checking if localtime_r usage allowed... yes
checking if localtime_r might be used... yes
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking if setsockopt can be linked... yes
checking if setsockopt is prototyped... yes
checking if setsockopt is compilable... yes
checking if setsockopt usage allowed... yes
checking if setsockopt might be used... yes
checking if setsockopt SO_NONBLOCK is compilable... no
checking if setsockopt SO_NONBLOCK might be used... no
checking for sys/types.h... (cached) yes
checking for signal.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking for setjmp.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strncasecmp can be linked... yes
checking if strncasecmp is prototyped... yes
checking if strncasecmp is compilable... yes
checking if strncasecmp usage allowed... yes
checking if strncasecmp might be used... yes
checking if strncmpi can be linked... no
checking if strncmpi might be used... no
checking if strnicmp can be linked... no
checking if strnicmp might be used... no
checking if strstr can be linked... yes
checking if strstr is prototyped... yes
checking if strstr is compilable... yes
checking if strstr usage allowed... yes
checking if strstr might be used... yes
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/uio.h... (cached) yes
checking if writev can be linked... yes
checking if writev is prototyped... yes
checking if writev is compilable... yes
checking if writev usage allowed... yes
checking if writev might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for usleep... yes
checking for utime... yes
checking for utimes... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking for gnroff... no
checking for nroff... /usr/bin/nroff
checking how to use *nroff to get plain text from man pages... -man
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable cryptographic authentication methods... yes
checking whether to enable NTLM delegation to winbind's helper... no
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... no
checking whether hiding of library internal symbols will actually happen... yes
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: amending lib/Makefile
configure: amending src/Makefile
configure: amending tests/unit/Makefile
configure: amending tests/server/Makefile
configure: amending tests/libtest/Makefile
configure: amending docs/examples/Makefile
configure: Configured to build curl/libcurl:

  Host setup:       x86_64-pc-linux-gnu
  Install prefix:   /usr/local
  Compiler:         ccache gcc
   CFLAGS:          -Werror-implicit-function-declaration -O2 -Wno-system-headers -Wenum-conversion
   CPPFLAGS:        
   LDFLAGS:         
   LIBS:            -lpsl -lz

  curl version:     7.73.0-DEV
  SSL:              no      (--with-{ssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,mesalink,amissl,bearssl} )
  SSH:              no      (--with-{libssh,libssh2})
  zlib:             enabled
  brotli:           no      (--with-brotli)
  zstd:             no      (--with-zstd)
  GSS-API:          no      (--with-gssapi)
  TLS-SRP:          no      (--enable-tls-srp)
  resolver:         POSIX threaded
  IPv6:             enabled
  Unix sockets:     enabled
  IDN:              no      (--with-{libidn2,winidn})
  Build libcurl:    Shared=no, Static=yes
  Built-in manual:  enabled
  --libcurl option: enabled (--disable-libcurl-option)
  Verbose errors:   enabled (--disable-verbose)
  Code coverage:    disabled
  SSPI:             no      (--enable-sspi)
  ca cert bundle:   no
  ca cert path:     
  ca fallback:      
  LDAP:             no      (--enable-ldap / --with-ldap-lib / --with-lber-lib)
  LDAPS:            no      (--enable-ldaps)
  RTSP:             enabled
  RTMP:             no      (--with-librtmp)
  Metalink:         no      (--with-libmetalink)
  PSL:              enabled
  Alt-svc:          no      (--enable-alt-svc)
  HTTP2:            no      (--with-nghttp2)
  HTTP3:            no      (--with-ngtcp2, --with-quiche)
  ECH:              no      (--enable-ech)
  Protocols:        DICT FILE FTP GOPHER HTTP IMAP MQTT POP3 RTSP SMTP TELNET TFTP
  Features:         AsynchDNS IPv6 PSL UnixSockets libz

configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.
configure: WARNING: Use --with-ssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink, --with-amissl or --with-bearssl to address this.
configure: WARNING: Cannot find libraries for IDN support: IDN disabled

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make  all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
  CC       libcurl_la-altsvc.lo
  CC       libcurl_la-amigaos.lo
  CC       libcurl_la-asyn-ares.lo
  CC       libcurl_la-asyn-thread.lo
  CC       libcurl_la-base64.lo
  CC       libcurl_la-conncache.lo
  CC       libcurl_la-connect.lo
  CC       libcurl_la-content_encoding.lo
  CC       libcurl_la-cookie.lo
  CC       libcurl_la-curl_addrinfo.lo
  CC       libcurl_la-curl_ctype.lo
  CC       libcurl_la-curl_des.lo
  CC       libcurl_la-curl_endian.lo
  CC       libcurl_la-curl_fnmatch.lo
  CC       libcurl_la-curl_get_line.lo
  CC       libcurl_la-curl_gethostname.lo
  CC       libcurl_la-curl_gssapi.lo
  CC       libcurl_la-curl_memrchr.lo
  CC       libcurl_la-curl_multibyte.lo
  CC       libcurl_la-curl_ntlm_core.lo
  CC       libcurl_la-curl_ntlm_wb.lo
  CC       libcurl_la-curl_path.lo
  CC       libcurl_la-curl_range.lo
  CC       libcurl_la-curl_rtmp.lo
  CC       libcurl_la-curl_sasl.lo
  CC       libcurl_la-curl_sspi.lo
  CC       libcurl_la-curl_threads.lo
  CC       libcurl_la-dict.lo
  CC       libcurl_la-dotdot.lo
  CC       libcurl_la-easy.lo
  CC       libcurl_la-escape.lo
  CC       libcurl_la-file.lo
  CC       libcurl_la-fileinfo.lo
  CC       libcurl_la-formdata.lo
  CC       libcurl_la-ftp.lo
  CC       libcurl_la-url.lo
  CC       libcurl_la-ftplistparser.lo
  CC       libcurl_la-getenv.lo
  CC       libcurl_la-getinfo.lo
  CC       libcurl_la-gopher.lo
  CC       libcurl_la-hash.lo
  CC       libcurl_la-hmac.lo
  CC       libcurl_la-hostasyn.lo
  CC       libcurl_la-hostcheck.lo
  CC       libcurl_la-hostip.lo
  CC       libcurl_la-hostip4.lo
  CC       libcurl_la-hostip6.lo
  CC       libcurl_la-hostsyn.lo
  CC       libcurl_la-http.lo
  CC       libcurl_la-http2.lo
  CC       libcurl_la-http_chunks.lo
  CC       libcurl_la-http_digest.lo
  CC       libcurl_la-http_negotiate.lo
  CC       libcurl_la-http_ntlm.lo
  CC       libcurl_la-http_proxy.lo
  CC       libcurl_la-idn_win32.lo
  CC       libcurl_la-if2ip.lo
  CC       libcurl_la-imap.lo
  CC       libcurl_la-inet_ntop.lo
  CC       libcurl_la-inet_pton.lo
  CC       libcurl_la-krb5.lo
  CC       libcurl_la-ldap.lo
  CC       libcurl_la-llist.lo
  CC       libcurl_la-md4.lo
  CC       libcurl_la-md5.lo
  CC       libcurl_la-memdebug.lo
  CC       libcurl_la-mime.lo
  CC       libcurl_la-mprintf.lo
  CC       libcurl_la-mqtt.lo
  CC       libcurl_la-multi.lo
  CC       libcurl_la-netrc.lo
  CC       libcurl_la-non-ascii.lo
  CC       libcurl_la-nonblock.lo
  CC       libcurl_la-openldap.lo
  CC       libcurl_la-parsedate.lo
  CC       libcurl_la-pingpong.lo
  CC       libcurl_la-pop3.lo
  CC       libcurl_la-progress.lo
  CC       libcurl_la-psl.lo
  CC       libcurl_la-doh.lo
  CC       libcurl_la-rand.lo
  CC       libcurl_la-rename.lo
  CC       libcurl_la-rtsp.lo
  CC       libcurl_la-select.lo
  CC       libcurl_la-sendf.lo
  CC       libcurl_la-setopt.lo
  CC       libcurl_la-sha256.lo
  CC       libcurl_la-share.lo
  CC       libcurl_la-slist.lo
  CC       libcurl_la-smb.lo
  CC       libcurl_la-smtp.lo
  CC       libcurl_la-socketpair.lo
  CC       libcurl_la-socks.lo
  CC       libcurl_la-socks_gssapi.lo
  CC       libcurl_la-socks_sspi.lo
  CC       libcurl_la-speedcheck.lo
  CC       libcurl_la-splay.lo
  CC       libcurl_la-strcase.lo
  CC       libcurl_la-strdup.lo
  CC       libcurl_la-strerror.lo
  CC       libcurl_la-strtok.lo
  CC       libcurl_la-strtoofft.lo
  CC       libcurl_la-system_win32.lo
  CC       libcurl_la-telnet.lo
  CC       libcurl_la-tftp.lo
  CC       libcurl_la-timeval.lo
  CC       libcurl_la-transfer.lo
  CC       libcurl_la-urlapi.lo
  CC       libcurl_la-version.lo
  CC       libcurl_la-warnless.lo
  CC       libcurl_la-wildcard.lo
  CC       libcurl_la-x509asn1.lo
  CC       libcurl_la-dynbuf.lo
  CC       libcurl_la-version_win32.lo
  CC       libcurl_la-easyoptions.lo
  CC       libcurl_la-easygetopt.lo
  CC       vauth/libcurl_la-cleartext.lo
  CC       vauth/libcurl_la-cram.lo
  CC       vauth/libcurl_la-digest.lo
  CC       vauth/libcurl_la-digest_sspi.lo
  CC       vauth/libcurl_la-krb5_gssapi.lo
  CC       vauth/libcurl_la-krb5_sspi.lo
  CC       vauth/libcurl_la-ntlm.lo
  CC       vauth/libcurl_la-ntlm_sspi.lo
  CC       vauth/libcurl_la-spnego_gssapi.lo
  CC       vauth/libcurl_la-oauth2.lo
  CC       vauth/libcurl_la-spnego_sspi.lo
  CC       vauth/libcurl_la-vauth.lo
  CC       vtls/libcurl_la-bearssl.lo
  CC       vtls/libcurl_la-gskit.lo
  CC       vtls/libcurl_la-gtls.lo
  CC       vtls/libcurl_la-keylog.lo
  CC       vtls/libcurl_la-mbedtls.lo
  CC       vtls/libcurl_la-mbedtls_threadlock.lo
  CC       vtls/libcurl_la-mesalink.lo
  CC       vtls/libcurl_la-nss.lo
  CC       vtls/libcurl_la-openssl.lo
  CC       vtls/libcurl_la-schannel.lo
  CC       vtls/libcurl_la-schannel_verify.lo
  CC       vtls/libcurl_la-sectransp.lo
  CC       vtls/libcurl_la-vtls.lo
  CC       vtls/libcurl_la-wolfssl.lo
  CC       vquic/libcurl_la-ngtcp2.lo
  CC       vquic/libcurl_la-quiche.lo
  CC       vquic/libcurl_la-vquic.lo
  CC       vssh/libcurl_la-libssh.lo
  CC       vssh/libcurl_la-libssh2.lo
  CC       vssh/libcurl_la-wolfssh.lo
  CCLD     libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in ../docs
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
if test "..x" != "..x" -a -e "./curl.1"; then \
	/usr/bin/install -c -m 644 "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
generate ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
  CC       curl-slist_wc.o
  CC       curl-tool_binmode.o
  CC       curl-tool_bname.o
  CC       curl-tool_cb_dbg.o
  CC       curl-tool_cb_hdr.o
  CC       curl-tool_cb_prg.o
  CC       curl-tool_cb_rea.o
  CC       curl-tool_cb_see.o
  CC       curl-tool_cb_wrt.o
  CC       curl-tool_cfgable.o
  CC       curl-tool_convert.o
  CC       curl-tool_dirhie.o
  CC       curl-tool_doswin.o
  CC       curl-tool_easysrc.o
  CC       curl-tool_filetime.o
  CC       curl-tool_formparse.o
  CC       curl-tool_getparam.o
  CC       curl-tool_getpass.o
  CC       curl-tool_help.o
  CC       curl-tool_helpers.o
  CC       curl-tool_homedir.o
  HUGE     tool_hugehelp.c
  CC       curl-tool_libinfo.o
  CC       curl-tool_main.o
  CC       curl-tool_metalink.o
  CC       curl-tool_msgs.o
  CC       curl-tool_operate.o
  CC       curl-tool_operhlp.o
  CC       curl-tool_panykey.o
  CC       curl-tool_paramhlp.o
  CC       curl-tool_parsecfg.o
  CC       curl-tool_progress.o
  CC       curl-tool_strdup.o
  CC       curl-tool_setopt.o
  CC       curl-tool_sleep.o
  CC       curl-tool_urlglob.o
  CC       curl-tool_util.o
  CC       curl-tool_vms.o
  CC       curl-tool_writeout.o
  CC       curl-tool_writeout_json.o
  CC       curl-tool_xattr.o
  CC       ../lib/curl-strtoofft.o
  CC       ../lib/curl-nonblock.o
  CC       ../lib/curl-warnless.o
  CC       ../lib/curl-curl_ctype.o
  CC       ../lib/curl-curl_multibyte.o
  CC       ../lib/curl-version_win32.o
  CC       ../lib/curl-dynbuf.o
  CC       curl-tool_hugehelp.o
  CCLD     curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

tests/FILEFORMAT.md+1 -0

@@ -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>`

tests/data/test1+1 -3

@@ -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>

tests/data/test10+1 -3

@@ -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

tests/data/test1001+2 -4

@@ -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

tests/data/test1002+4 -6

@@ -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

tests/data/test1004+1 -3

@@ -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>

tests/data/test1008+3 -4

@@ -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]

tests/data/test1011+2 -4

@@ -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>

tests/data/test1012+2 -4

@@ -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

tests/data/test1015+1 -4

@@ -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

tests/data/test1021+4 -4

@@ -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>

tests/data/test1024+3 -3

@@ -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

tests/data/test1025+3 -3

@@ -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

tests/data/test1028+1 -3

@@ -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

tests/data/test1029+1 -3

@@ -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>

tests/data/test1030+2 -4

@@ -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

tests/data/test1031+2 -3

@@ -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>

tests/data/test1032+1 -3

@@ -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>

tests/data/test1033+1 -3

@@ -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>

tests/data/test1035+0 -3

@@ -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>

tests/data/test1040+1 -3

@@ -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>

tests/data/test1041+1 -3

@@ -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

tests/data/test1042+1 -3

@@ -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>

tests/data/test1043+1 -3

@@ -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>

tests/data/test1045+1 -3

@@ -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>

tests/data/test1046+1 -3

@@ -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>

tests/data/test1051+2 -3

@@ -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

tests/data/test1052+2 -3

@@ -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

tests/data/test1053+3 -3

@@ -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

tests/data/test1054+2 -3

@@ -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

tests/data/test1055+1 -3

@@ -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

tests/data/test1056+2 -3

@@ -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>

tests/data/test1058+1 -3

@@ -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>

tests/data/test1059+1 -3

@@ -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>

tests/data/test1060+3 -3

@@ -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>

tests/data/test1061+3 -3

@@ -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>

tests/data/test1064+2 -3

@@ -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

tests/data/test1065+2 -3

@@ -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>

tests/data/test1066+2 -3

@@ -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>

tests/data/test1067+2 -3

@@ -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

tests/data/test1068+1 -3

@@ -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

tests/data/test1070+1 -3

@@ -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

tests/data/test1071+2 -3

@@ -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

tests/data/test1072+1 -3

@@ -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

tests/data/test1073+1 -3

@@ -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

tests/data/test1074+2 -3

@@ -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>

tests/data/test1075+2 -3

@@ -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

tests/data/test1076+2 -4

@@ -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

tests/data/test1077+2 -3

@@ -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

tests/data/test1078+3 -3

@@ -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>

tests/data/test1079+2 -3

@@ -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>

tests/data/test1080+2 -3

@@ -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>

tests/data/test1081+2 -3

@@ -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>

tests/data/test1082+1 -3

@@ -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>

tests/data/test1083+1 -3

@@ -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>

tests/data/test1087+3 -3

@@ -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

tests/data/test1088+3 -3

@@ -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

tests/data/test1089+2 -3

@@ -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>

tests/data/test1090+2 -3

@@ -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>

tests/data/test1092+1 -3

@@ -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

tests/data/test1095+2 -4

@@ -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>

tests/data/test1097+2 -5

@@ -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

tests/data/test1098+2 -3

@@ -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

tests/data/test11+2 -3

@@ -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>

tests/data/test1100+3 -7

@@ -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>

tests/data/test1101+1 -3

@@ -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>

tests/data/test1104+2 -3

@@ -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

tests/data/test1105+1 -3

@@ -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

tests/data/test1106+1 -3

@@ -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

tests/data/test1109+1 -3

@@ -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>

tests/data/test1110+1 -3

@@ -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>

tests/data/test1111+1 -3

@@ -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>

tests/data/test1115+1 -3

@@ -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>

tests/data/test1116+1 -3

@@ -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>

tests/data/test1117+2 -3

@@ -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>

tests/data/test1118+1 -3

@@ -42,12 +42,10 @@ http://%HOSTIP:%[email protected]/1118
	#
	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /[email protected]/1118 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1121+1 -3

@@ -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>

tests/data/test1122+1 -3

@@ -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

tests/data/test1123+1 -3

@@ -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

tests/data/test1124+1 -3

@@ -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

tests/data/test1125+1 -3

@@ -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

tests/data/test1126+1 -3

@@ -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

tests/data/test1127+1 -3

@@ -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

tests/data/test1128+2 -3

@@ -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

tests/data/test1129+2 -3

@@ -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

tests/data/test1130+2 -3

@@ -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

tests/data/test1131+2 -3

@@ -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

tests/data/test1133+2 -2

@@ -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

tests/data/test1134+2 -3

@@ -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]

tests/data/test1138+2 -4

@@ -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>

tests/data/test1141+2 -3

@@ -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

tests/data/test1142+1 -3

@@ -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

tests/data/test1143+1 -3

@@ -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>

tests/data/test1144+1 -3

@@ -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>

tests/data/test1148+1 -3

@@ -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>

tests/data/test1150+2 -3

@@ -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

tests/data/test1151+1 -3

@@ -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>

tests/data/test1154+1 -3

@@ -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>

tests/data/test1155+1 -3

@@ -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>

tests/data/test1157+1 -3

@@ -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>

tests/data/test1158+2 -2

@@ -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
-	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: 954
	Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32

tests/data/test1159+1 -3

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

	</protocol>

tests/data/test1160+1 -3

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

	</protocol>

tests/data/test1161+1 -3

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

	</protocol>

tests/data/test1164+1 -3

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

	</protocol>

tests/data/test1166+2 -3

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

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

	</protocol>

tests/data/test1168+2 -3

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

	GET /data/11680002.txt HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ==
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1170+1 -3

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

tests/data/test1171+1 -3

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

tests/data/test1172+1 -3

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

	</protocol>

tests/data/test1174+1 -3

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

	</protocol>

tests/data/test1176+1 -3

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

	</protocol>

tests/data/test1178+1 -3

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

tests/data/test1197+2 -3

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

	twinkle twinkle little starGET /11970001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test12+1 -3

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

	</protocol>

tests/data/test1204+2 -3

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

	GET /1204 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1205+1 -3

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

	</protocol>

tests/data/test1210+1 -3

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

	</protocol>

tests/data/test1212+1 -3

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

	</protocol>

tests/data/test1213+1 -3

@@ -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
	Host: we.want.that.site.com.1213
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1214+1 -3

@@ -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
	Host: we.want.that.site.com.1214
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1215+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/7.30.0-DEV
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://%HOSTIP:%HTTPPORT/1215 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-	User-Agent: curl/7.30.0-DEV
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1216+2 -3

@@ -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
	Host: example.fake
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Cookie: moo3=indeed; moo2=indeed

	GET http://bexample.fake/c/1216 HTTP/1.1
	Host: bexample.fake
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1218+3 -3

@@ -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
	Host: example.fake
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://example.fake/c/1218 HTTP/1.1
	Host: example.fake
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Cookie: bug=fixed

	GET http://bexample.fake/c/1218 HTTP/1.1
	Host: bexample.fake
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1223+1 -3

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

	</protocol>

tests/data/test1228+2 -3

@@ -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
	Host: example.fake
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://example.fake/hogege/ HTTP/1.1
	Host: example.fake
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Cookie: path1=root

tests/data/test1229+2 -3

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

	GET /1229 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/1229", response="f2694d426040712584c156d3de72b8d6"
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1230+2 -3

@@ -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
	Host: [1234:1234:1234::4ce]:%HTTPPORT
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	GET /wanted/page/1230 HTTP/1.1
	Host: [1234:1234:1234::4ce]:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1231+2 -3

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

	GET /hej/but/12310001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1232+2 -3

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

	GET http://test.remote.haxx.se.1232:8990/hej/but/12320001 HTTP/1.1
	Host: test.remote.haxx.se.1232:8990
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1235+4 -7

@@ -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
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /12350002 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /12350001 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /12350002 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1237+1 -3

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

	</protocol>

tests/data/test1239+1 -3

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

tests/data/test1240+2 -3

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

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

	</protocol>

tests/data/test1241+2 -3

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

	GET http://test.remote.haxx.se.1241:8990/../../hej/but/who/../12410001 HTTP/1.1
	Host: test.remote.haxx.se.1241:8990
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1244+1 -3

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

tests/data/test1245+1 -3

@@ -42,12 +42,10 @@ ftp
	#
	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1245 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1246+2 -3

@@ -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
	Host: test.remote.haxx.se.1246:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://no-scheme-url.com.1246:%HTTPPORT/ HTTP/1.1
	Host: no-scheme-url.com.1246:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1248+1 -3

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

	</protocol>

tests/data/test1249+1 -3

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

	</protocol>

tests/data/test1250+1 -3

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

	</protocol>

tests/data/test1251+1 -3

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

	</protocol>

tests/data/test1252+1 -3

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

	</protocol>

tests/data/test1253+1 -3

@@ -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
	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1254+1 -3

@@ -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
	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1255+1 -3

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

	</protocol>

tests/data/test1256+1 -3

@@ -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
	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1257+1 -3

@@ -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
	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1258+2 -3

@@ -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
	Host: localhost
+	User-Agent: curl/%VERSION
	Accept: /

	GET /we/want?hoge=fuga HTTP/1.1
	Host: localhost
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: I-am=here

tests/data/test1259+1 -3

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

	</protocol>

tests/data/test1261+1 -3

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

	</protocol>

tests/data/test1265+1 -3

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

	</protocol>

tests/data/test1266+1 -3

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

	</protocol>

tests/data/test1267+1 -3

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

	</protocol>

tests/data/test1270+1 -3

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

	</protocol>

tests/data/test1271+1 -3

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

	</protocol>

tests/data/test1280+4 -3

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

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

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

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

	</protocol>

tests/data/test1283+1 -3

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

	</protocol>

tests/data/test1284+2 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 0
	Content-Type: application/x-www-form-urlencoded
@@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded
	POST /1284 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1284", response="5763079608de439072861a59ac733515"
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 11
	Content-Type: application/x-www-form-urlencoded

tests/data/test1285+2 -3

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

	PUT /1285 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1285", response="dc185587d5e8391b347eef194c2a3cd6"
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 85
	Expect: 100-continue

tests/data/test1286+4 -3

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

	GET /1286 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/1286", username="auser"
+	User-Agent: curl/%VERSION
	Accept: /

	GET /12860001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/12860001", username="auser"
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1287+2 -3

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

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

	</protocol>

tests/data/test1288+2 -3

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

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

	</protocol>

tests/data/test1290+1 -3

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

	</protocol>

tests/data/test1292+1 -3

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

	</protocol>

tests/data/test1293+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 126
	Content-Type: multipart/form-data; boundary=----------------------------

tests/data/test1294+1 -3

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

tests/data/test1295+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300
	Content-Length: 165

tests/data/test1296+1 -3

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

	</protocol>

tests/data/test1297+2 -3

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

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

	</protocol>

tests/data/test1298+1 -3

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

tests/data/test1299+1 -3

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

tests/data/test13+1 -3

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

	</protocol>

tests/data/test1310+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAwAAAA
-	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: /

	GET /1310 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAE8AAAAYABgAZwAAAAAAAABAAAAACAAIAEAAAAAHAAcASAAAAAAAAAAAAAAAggEAAHRlc3R1c2VyVU5LTk9XTlpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOQ==
-	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: /

	</protocol>

tests/data/test1311+1 -3

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

	</protocol>

tests/data/test1312+1 -3

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

	</protocol>

tests/data/test1313+1 -3

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

	</protocol>

tests/data/test1314+2 -3

@@ -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
	Host: firstplace.example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://somewhere.example.com/reply/1314 HTTP/1.1
	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1315+2 -2

@@ -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
-	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: 797
	Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763

tests/data/test1317+1 -3

@@ -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
	Host: example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1318+2 -3

@@ -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
	Host: MiXeDcAsE.cOm:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /13180001 HTTP/1.1
	Host: mixedcase.com:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1319+1 -4

@@ -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
	USER user
@@ -76,7 +73,7 @@ QUIT
	<proxy>
	CONNECT pop.1319:%POP3PORT HTTP/1.1
	Host: pop.1319:%POP3PORT
-	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
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>

tests/data/test1320+1 -4

@@ -46,9 +46,6 @@ smtp://smtp.1320:%SMTPPORT/1320 --mail-rcpt [email protected] --mail-from se
	#
	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent: curl/.*
-	</strip>
	<protocol>
	EHLO 1320
	MAIL FROM:<[email protected]>
@@ -66,7 +63,7 @@ body
	<proxy>
	CONNECT smtp.1320:%SMTPPORT HTTP/1.1
	Host: smtp.1320:%SMTPPORT
-	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
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>

tests/data/test1321+1 -4

@@ -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
	A002 LOGIN user secret
@@ -72,7 +69,7 @@ A005 LOGOUT
	<proxy>
	CONNECT imap.1321:%IMAPPORT HTTP/1.1
	Host: imap.1321:%IMAPPORT
-	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
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>

tests/data/test1322+1 -3

@@ -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
	Host: example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1324+1 -3

@@ -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
	Host: example.com:%HTTP6PORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1325+2 -3

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

	mooPOST /we/13250002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 3
	Content-Type: application/x-www-form-urlencoded

tests/data/test1328+2 -3

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

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

	</protocol>

tests/data/test1331+2 -3

@@ -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
	Host: z.x.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://z.x.com/1331 HTTP/1.1
	Host: z.x.com
	Proxy-Authorization: Basic bXluYW1lOm15cGFzc3dvcmQ=
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Cookie: proxycookie=weirdo

tests/data/test1332+2 -4

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

	mooPOST /blah/moo.html&testcase=/13320002 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

tests/data/test1333+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Transfer-Encoding: chunked
	Content-Type: application/x-www-form-urlencoded

tests/data/test1334+1 -3

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

	</protocol>

tests/data/test1335+1 -3

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

	</protocol>

tests/data/test1336+1 -3

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

	</protocol>

tests/data/test1337+1 -3

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

	</protocol>

tests/data/test1338+1 -3

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

	</protocol>

tests/data/test1339+1 -3

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

	</protocol>

tests/data/test1340+1 -3

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

	</protocol>

tests/data/test1341+1 -3

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

	</protocol>

tests/data/test1342+1 -3

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

	</protocol>

tests/data/test1343+1 -3

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

	</protocol>

tests/data/test1344+1 -3

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

	</protocol>

tests/data/test1345+1 -3

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

	</protocol>

tests/data/test1346+1 -3

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

	</protocol>

tests/data/test1347+1 -3

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

	</protocol>

tests/data/test1364+1 -3

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

	</protocol>

tests/data/test1365+1 -3

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

	</protocol>

tests/data/test1366+1 -3

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

	</protocol>

tests/data/test1367+1 -3

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

	</protocol>

tests/data/test1368+1 -3

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

	</protocol>

tests/data/test1369+1 -3

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

	</protocol>

tests/data/test1370+1 -3

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

	</protocol>

tests/data/test1371+1 -3

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

	</protocol>

tests/data/test1372+1 -3

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

	</protocol>

tests/data/test1373+1 -3

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

	</protocol>

tests/data/test1374+1 -3

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

	</protocol>

tests/data/test1375+1 -3

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

	</protocol>

tests/data/test1376+1 -3

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

	</protocol>

tests/data/test1377+1 -3

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

	</protocol>

tests/data/test14+1 -4

@@ -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
-	User-Agent: curl/7.4.2-pre4 (sparc-sun-solaris2.7) libcurl 7.4.2-pre4
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1400+1 -4

@@ -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
-	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: /

	</protocol>

tests/data/test1401+1 -4

@@ -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
	Host: %HOSTIP:%HTTPPORT
-	User-Agent: stripped
	Authorization: Basic ZmFrZTp1c2Vy
+	User-Agent: MyUA
	Accept: /
	Cookie: chocolate=chip
	X-Files: Mulder

tests/data/test1402+1 -4

@@ -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
-	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: 16
	Content-Type: application/x-www-form-urlencoded

tests/data/test1403+1 -4

@@ -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
-	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: /

	</protocol>

tests/data/test1404+2 -2

@@ -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
-	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: 882
	Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763

tests/data/test1408+2 -3

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

	GET /path/14080002 HTTP/1.1
	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: time=1

tests/data/test1411+1 -3

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

tests/data/test1412+4 -6

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

	GET /1412 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/1412", response="0390dbe89e31adca0413d11f91f30e7f"
-	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: /

	GET /14120001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
-	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: /

	GET /14120001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/14120001", response="0085df91870374c8bf4e94415e7fbf8e"
-	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>

tests/data/test1413+2 -3

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

	GET /this/moo.html/14130002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1415+1 -3

@@ -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
	Host: example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1416+1 -3

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

	</protocol>

tests/data/test1417+1 -3

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

	</protocol>

tests/data/test1418+4 -3

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

	GET /1418 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/1418", response="986238b7e0077754944c966f56d9bc77"
+	User-Agent: curl/%VERSION
	Accept: /

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

	GET /14180003 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/14180003", response="1c6390a67bac3283a9b023402f3b3540"
+	User-Agent: curl/%VERSION
	Accept: /

	[DISCONNECT]

tests/data/test1419+2 -3

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

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

	[DISCONNECT]

tests/data/test1421+2 -3

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

	GET http://different.remote.haxx.se.1421:8990/ HTTP/1.1
	Host: different.remote.haxx.se.1421:8990
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1422+1 -3

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

	</protocol>

tests/data/test1423+1 -3

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

	</protocol>

tests/data/test1424+1 -3

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

?+0 -0

tests/data/test1428+2 -5

@@ -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
	Host: test.1428:%HTTPPORT
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive
	header-type: proxy

@@ -75,7 +72,7 @@ header-type: proxy
	GET /we/want/that/page/1428 HTTP/1.1
	Host: test.1428:%HTTPPORT
	Authorization: Basic aWFtOm15OjtzZWxm
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Accept: /
	header-type: server

tests/data/test1429+1 -3

@@ -57,12 +57,10 @@ Funny-head: yesyes
	-foo-
	234
	</stdout>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1429 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1430+1 -3

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

	</protocol>

tests/data/test1431+1 -3

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

	</protocol>

tests/data/test1432+1 -3

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

	</protocol>

tests/data/test1433+1 -3

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

	</protocol>

tests/data/test1434+1 -3

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

	</protocol>

tests/data/test1435+1 -3

@@ -33,12 +33,10 @@ simple HTTP GET over Unix socket
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1435 HTTP/1.1
	Host: server-interpreted.example.com
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1436+3 -3

@@ -47,20 +47,20 @@ HTTP requests with multiple connections over Unix socket
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /14360001 HTTP/1.1
	Host: one.example.com
+	User-Agent: curl/%VERSION
	Accept: /

	GET /14360002 HTTP/1.1
	Host: two.example.com
+	User-Agent: curl/%VERSION
	Accept: /

	GET /14360003 HTTP/1.1
	Host: one.example.com
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1437+2 -4

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

	GET /1437 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/1437", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5
-	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>

tests/data/test1438+1 -3

@@ -48,11 +48,9 @@ HTTP
	<protocol>
	GET /1438 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<strip>
-	^User-Agent:.*
-	</strip>
	</verify>
	</testcase>

tests/data/test1439+1 -3

@@ -48,11 +48,9 @@ testdata
	<protocol>
	GET /1439 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<strip>
-	^User-Agent:.*
-	</strip>
	</verify>
	</testcase>

tests/data/test1443+1 -3

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

	</protocol>

tests/data/test1448+2 -3

@@ -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
	Host: xn--4cab6c.se:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /14480001 HTTP/1.1
	Host: xn--4cab6c.se:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1455+1 -3

@@ -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
	GET /1455 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Testno: 1455

tests/data/test1456+1 -4

@@ -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
	GET /1456 HTTP/1.1
	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1457+1 -3

@@ -51,11 +51,9 @@ line2
	<protocol>
	GET /1457 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<strip>
-	^User-Agent:.*
-	</strip>
	</verify>
	</testcase>

tests/data/test1458+1 -3

@@ -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
	Host: example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1460+0 -3

@@ -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

?+0 -0

tests/data/test15+1 -3

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

	</protocol>

tests/data/test150+2 -5

@@ -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
	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: /

	GET /150 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: /

	</protocol>

tests/data/test1502+0 -3

@@ -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
	Host: google.com:%HTTPPORT

tests/data/test1503+0 -3

@@ -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
	Host: google.com:%HTTPPORT

tests/data/test1504+0 -3

@@ -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
	Host: google.com:%HTTPPORT

tests/data/test1505+0 -3

@@ -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
	Host: google.com:%HTTPPORT

tests/data/test151+1 -4

@@ -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
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test152+1 -4

@@ -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
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1524+2 -4

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 4
	Expect: 100-continue

	moo
	GET /blah/moo.html&testcase=/15240002 HTTP/1.1
-	User-Agent: this should be ignored
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

tests/data/test153+5 -5

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

	GET /1530001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530001", response="f4f83139396995bac665f24a1f1055c7"
-	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: /

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

	GET /1530002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530002", response="f84511b014fdd0ba6494f42871079c32"
-	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
+	User-Agent: curl/%VERSION
	Accept: /

	GET /1530002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/1530002", cnonce="MTA4MzIy", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5
-	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
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test154+2 -4

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 85
	Expect: 100-continue
@@ -95,7 +93,7 @@ Expect: 100-continue
	PUT /154 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/154", response="b71551e12d1c456e47d8388ecb2edeca"
-	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

tests/data/test155+3 -4

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 85
	Expect: 100-continue
@@ -121,13 +119,14 @@ Expect: 100-continue
	PUT /155 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 0

	PUT /155 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-	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

tests/data/test1551+0 -3

@@ -47,9 +47,6 @@ http://%HOSTIP:%HTTPPORT/1551
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1551 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test1556+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test156+1 -4

@@ -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
-	User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 85
	Expect: 100-continue

tests/data/test1561+2 -5

@@ -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
	Host: www.example.com
-	User-Agent: curl/7.62.0-DEV
+	User-Agent: curl/%VERSION
	Accept: /

	GET /15610002 HTTP/1.1
	Host: www.example.com
-	User-Agent: curl/7.62.0-DEV
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1562+3 -3

@@ -48,21 +48,21 @@ Expire secure cookies over HTTPS
	</command>
	</client>
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /15620001 HTTP/1.1
	Host: www.example.com
+	User-Agent: curl/%VERSION
	Accept: /

	GET /15620002 HTTP/1.1
	Host: www.example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: foo=123

	GET /15620001 HTTP/1.1
	Host: www.example.com
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1563+1 -3

@@ -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
	Host: www.example.com
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1566+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	If-None-Match: "123456"

tests/data/test1567+0 -3

@@ -48,9 +48,6 @@ http://%HOSTIP:%HTTPPORT/1567
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1567 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test157+1 -3

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

	</protocol>

tests/data/test158+1 -2

@@ -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
-	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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 145
	Content-Type: multipart/form-data; boundary=----------------------------4f12fcdaa3bc

tests/data/test159+1 -4

@@ -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
	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: /

	</protocol>

tests/data/test1591+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test1593+0 -3

@@ -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

tests/data/test1594+0 -3

@@ -36,9 +36,6 @@ http://%HOSTIP:%HTTPPORT/1594
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1594 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test1595+0 -3

@@ -35,9 +35,6 @@ http://%HOSTIP:%HTTPPORT/1595
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1595 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test1596+0 -3

@@ -36,9 +36,6 @@ http://%HOSTIP:%HTTPPORT/1596
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1596 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test16+1 -3

@@ -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
	Host: we.want.that.site.com
	Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test160+2 -3

@@ -56,16 +56,15 @@ Connection: close
	surprise2
	</stdout>

-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /want/160 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

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

	</protocol>

tests/data/test162+1 -4

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test163+2 -2

@@ -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
-	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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 304
	Content-Type: multipart/form-data; boundary=----------------------------c2d1767eb6ac

tests/data/test1630+1 -3

@@ -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
	Host: we.want.that.site.com
	Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test1633+4 -3

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

	mooGET /16330002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	POST /1633 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 3
	Content-Type: application/x-www-form-urlencoded

	mooGET /16330002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test164+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=0-10,12-15
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test165+2 -3

@@ -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
	Host: www.xn--4cab6c.se
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://www.xn--groe-xna.de/page/165 HTTP/1.1
	Host: www.xn--groe-xna.de
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test166+2 -2

@@ -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
-	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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 223
	Content-Type: multipart/form-data; boundary=----------------------------b0b3d6d23991

tests/data/test167+2 -5

@@ -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
	Host: data.from.server.requiring.digest.hohoho.com
	Proxy-Authorization: Basic Zm9vOmJhcg==
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

@@ -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
	Proxy-Authorization: Basic Zm9vOmJhcg==
	Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/167", response="13c7c02a252cbe1c46d8669898a3be26"
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test168+3 -6

@@ -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
	Host: data.from.server.requiring.digest.hohoho.com
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://data.from.server.requiring.digest.hohoho.com/168 HTTP/1.1
	Host: data.from.server.requiring.digest.hohoho.com
	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

@@ -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
	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/168", response="fb8608e00ad9239a3dedb14bc8575976"
	Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/168", response="ca87f2d768a231e2d637a55698d5c416"
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test169+3 -6

@@ -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
	Host: data.from.server.requiring.digest.hohoho.com
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
	Host: data.from.server.requiring.digest.hohoho.com
	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://data.from.server.requiring.digest.hohoho.com/169 HTTP/1.1
	Host: data.from.server.requiring.digest.hohoho.com
	Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/169", response="95d48591985a03c4b49cb962aa7bd3e6"
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test170+1 -4

@@ -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
	Host: a.galaxy.far.far.away
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 0

tests/data/test1700+2 -1

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

	GET /17000001 HTTP/1.1
	Host: %HOSTIP:%HTTP2PORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1701+1 -1

@@ -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
	Host: %HOSTIP:%HTTP2PORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 10
	Content-Type: application/x-www-form-urlencoded

tests/data/test1702+1 -1

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

	</protocol>

tests/data/test171+1 -3

@@ -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
	Host: z.x.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test172+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: nodomain=value; partmatch=present; tool=curl; name=fool

tests/data/test173+2 -2

@@ -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
-	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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 360
	Content-Type: multipart/form-data; boundary=----------------------------5dbea401cd8c

tests/data/test174+1 -4

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

tests/data/test175+2 -5

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

	POST /175 HTTP/1.1
-	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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 11
	Content-Type: application/x-www-form-urlencoded

tests/data/test176+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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: /
	Content-Length: 0
	Content-Type: application/x-www-form-urlencoded

	POST /176 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
-	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: /
	Content-Length: 11
	Content-Type: application/x-www-form-urlencoded

tests/data/test177+1 -4

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

tests/data/test178+1 -3

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

	</protocol>

tests/data/test179+1 -3

@@ -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
	Host: supertrooper.fake
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Cookie: moo2=indeed

tests/data/test18+3 -6

@@ -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
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /180002 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /180003 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test180+1 -3

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

tests/data/test1800+1 -3

@@ -39,12 +39,10 @@ http://%HOSTIP:%HTTPPORT/1800 --http2
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1800 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Connection: Upgrade, HTTP2-Settings
	Upgrade: %H2CVER

tests/data/test1801+1 -3

@@ -49,12 +49,10 @@ http://%HOSTIP:%HTTPPORT/1801 --http2
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1801 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Connection: Upgrade, HTTP2-Settings
	Upgrade: %H2CVER

tests/data/test181+1 -3

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

tests/data/test183+2 -5

@@ -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
-	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: deathstar.another.galaxy
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://a.galaxy.far.far.away/183 HTTP/1.1
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test184+2 -4

@@ -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
	Host: another.visitor.stay.a.while.stay.foreeeeeever
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://yet.another.host/184 HTTP/1.1
	Host: yet.another.host
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test185+2 -4

@@ -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
	Host: another.visitor.stay.a.while.stay.foreeeeeever
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://deathstar.another.galaxy/go/west/185 HTTP/1.1
	Host: another.visitor.stay.a.while.stay.foreeeeeever
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test186+2 -2

@@ -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
-	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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 320
	Content-Type: multipart/form-data; boundary=----------------------------212d9006ceb5

tests/data/test187+2 -3

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

	GET /root/1870002.txt?coolsite=yes HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test188+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=50-
-	User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
+	User-Agent: curl/%VERSION
	Accept: /

	GET /188 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=50-
-	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
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test189+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=50-
-	User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
+	User-Agent: curl/%VERSION
	Accept: /

	GET /189 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=50-
-	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
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1904+2 -5

@@ -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
	Host: test.1904:%HTTPPORT
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
	<protocol>
	GET /we/want/that/page/1904 HTTP/1.1
	Host: test.1904:%HTTPPORT
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test1905+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test1906+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test1907+0 -3

@@ -37,9 +37,6 @@ lib1907

	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1907 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test1908+0 -3

@@ -57,9 +57,6 @@ lib1908

	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1908 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test1909+2 -3

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

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

	</protocol>

tests/data/test1910+0 -3

@@ -49,9 +49,6 @@ lib1910

	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /1910 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test192+1 -3

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

	</protocol>

tests/data/test193+2 -3

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

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

	</protocol>

tests/data/test194+1 -3

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

	</protocol>

tests/data/test197+2 -3

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

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

	</protocol>

tests/data/test198+2 -3

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

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

	</protocol>

tests/data/test199+2 -3

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

	GET /199?foo=moo&moo=poo HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2+1 -3

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

	</protocol>

tests/data/test2001+1 -3

@@ -63,12 +63,10 @@ moo
	#
	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /20010001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	USER anonymous

tests/data/test2002+1 -3

@@ -72,12 +72,10 @@ moo
	#
	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /20020001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	USER anonymous

tests/data/test2003+2 -3

@@ -72,12 +72,10 @@ moo
	#
	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /20030001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	USER anonymous
@@ -104,6 +102,7 @@ SIZE 20030002
	RETR 20030002
	GET /20030001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	QUIT

tests/data/test2005+1 -3

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

	</protocol>

tests/data/test2006+1 -3

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

	</protocol>

tests/data/test2007+1 -3

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

	</protocol>

tests/data/test2008+1 -3

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

	</protocol>

tests/data/test2009+1 -3

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

	</protocol>

tests/data/test2010+1 -3

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

	</protocol>

tests/data/test2011+1 -3

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

	</protocol>

tests/data/test2012+1 -3

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

	</protocol>

tests/data/test2023+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2024+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2025+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2026+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2027+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2028+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2029+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2030+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2031+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2032+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test2034+1 -3

@@ -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
	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2036+0 -3

@@ -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>

tests/data/test2037+1 -2

@@ -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
	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2040+2 -3

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

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

	</protocol>

tests/data/test2041+1 -3

@@ -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
	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2046+2 -3

@@ -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
	Host: xn--4cab6c.se:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /20460001 HTTP/1.1
	Host: xn--4cab6c.se:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2047+2 -3

@@ -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
	Host: xn--4cab6c.se
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://xn--4cab6c.se/20470001 HTTP/1.1
	Host: xn--4cab6c.se
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test2049+4 -3

@@ -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
	Host: www1.example.com:8081
+	User-Agent: curl/%VERSION
	Accept: /

	GET /2049 HTTP/1.1
	Host: www2.example.com:8082
+	User-Agent: curl/%VERSION
	Accept: /

	GET /2049 HTTP/1.1
	Host: www3.example.com:8083
+	User-Agent: curl/%VERSION
	Accept: /

	GET /2049 HTTP/1.1
	Host: www4.example.com:8084
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2050+2 -3

@@ -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
	Host: connect.example.com.2050:%HTTPPORT
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
	<protocol>
	GET /2050 HTTP/1.1
	Host: www.example.com.2050
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2051+3 -3

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

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

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

	</protocol>

tests/data/test2052+2 -3

@@ -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
	Host: www.example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /2052 HTTP/1.1
	Host: www.example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2053+2 -3

@@ -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
	Host: 10.0.0.1:8081
+	User-Agent: curl/%VERSION
	Accept: /

	GET /2053 HTTP/1.1
	Host: [fc00::1]:8082
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2054+4 -3

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

	GET /2054 HTTP/1.1
	Host: www.example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /2054 HTTP/1.1
	Host: %HOSTIP:8083
+	User-Agent: curl/%VERSION
	Accept: /

	GET /2054 HTTP/1.1
	Host: www.example.com:8084
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2055+2 -3

@@ -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
	Host: connect.example.com.2055:%HTTPPORT
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
	<protocol>
	GET /2055 HTTP/1.1
	Host: www.example.com.2055
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2056+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Authorization: Negotiate IktSQjVfQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjE6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2057+2 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjI6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==
+	User-Agent: curl/%VERSION
	Accept: /

	GET /2057 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Negotiate Ik5UTE1fQWxpY2UiOkhUVFBAMTI3LjAuMC4xOjM6QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2058+2 -4

@@ -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
	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/2058 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2058", response="fbed69f9f3fd304c8f1acb1a43eb32688b933c0e28055c16b926cbcec070aeed", algorithm=SHA-256
	Content-Range: bytes 2-4/5
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 3

tests/data/test2059+2 -4

@@ -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
	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/2059 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2059", response="fc09be8192851e284e73e8b719b32a2f6f91cca0594e68713da8c49dc2c1656e", algorithm=SHA-512-256, userhash=true
	Content-Range: bytes 2-4/5
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 3

tests/data/test206+3 -4

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

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

	GET /path/2060002 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.haxx.se.206:8990
+	User-Agent: curl/%VERSION
	Accept: /

	[DISCONNECT]

tests/data/test2060+2 -4

@@ -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
	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/2060 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2060", response="3ce1e25ffa611bdbe90e2ab367b9602fa223db9f6de76ac667f0d6157e2178a6", algorithm=SHA-512-256
	Content-Range: bytes 2-4/5
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 3

tests/data/test2061+2 -4

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

	GET /2061 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2061", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256
-	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>

tests/data/test2062+2 -4

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

	GET /2062 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/2062", response="2af735ec3508f4dff99248ffbbe9de9002bfd7cc770cfa2b026cb334042a54e3", algorithm=SHA-512-256
-	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>

tests/data/test2063+2 -4

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

	GET /2063 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/2063", response="43f7ab531dff687b5dc75617daa59d1fd67d648341d6d2655ca65ef5064cfb51", algorithm=SHA-512-256, userhash=true
-	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>

tests/data/test2064+2 -4

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

	GET /2064 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2064", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256
-	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>

tests/data/test2065+2 -4

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

	GET /2065 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/2065", response="5a5f20b0e601aeddc6f96422c2332d49ff431c49ab143b5f836ef76e9ac78f5e", algorithm=SHA-512-256
-	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>

tests/data/test2066+2 -4

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

	GET /2066 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/2066", response="a2e2ae589f575fb132991d6f550ef14bf7ef697d2fef1242d2498f07eafc77dc", algorithm=SHA-512-256, userhash=true
-	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>

tests/data/test2067+2 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 0
	Content-Type: application/x-www-form-urlencoded
@@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded
	POST /2067 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2067", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 11
	Content-Type: application/x-www-form-urlencoded

tests/data/test2068+2 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 0
	Content-Type: application/x-www-form-urlencoded
@@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded
	POST /2068 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/2068", response="4bc9c97a72f1856bcec9b0e1518c6b7ee28773f91357d56840bdc30bd89ca68f", algorithm=SHA-512-256
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 11
	Content-Type: application/x-www-form-urlencoded

tests/data/test2069+2 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 0
	Content-Type: application/x-www-form-urlencoded
@@ -79,6 +77,7 @@ Content-Type: application/x-www-form-urlencoded
	POST /2069 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/2069", response="ff13d977110a471f30de75e747976e4de78d7a3d2425cd23ff46e67f4bc9ead7", algorithm=SHA-512-256, userhash=true
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 11
	Content-Type: application/x-www-form-urlencoded

tests/data/test207+1 -3

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

	</protocol>

tests/data/test2070+1 -3

@@ -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
	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2073+3 -1

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

@@ -56,6 +57,7 @@ Content-Type: application/pdf
	a
	POST /2073 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 184

tests/data/test2074+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Authorization: Bearer mF_9.B5f-4.1JqM
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2076+2 -3

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

	GET /2076?query HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/2076?query", response="5758bd3bbde7f33236e6ccd278eb59af"
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test2078+1 -3

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

tests/data/test208+1 -3

@@ -50,13 +50,11 @@ the

	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	PUT ftp://daniel:[email protected]/we/want/208 HTTP/1.1
	Host: host.com:21
	Authorization: Basic ZGFuaWVsOm15c2VjcmV0
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 78

tests/data/test209+3 -4

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

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

	GET /path/2090002 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.209:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

?+0 -0

tests/data/test213+3 -4

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

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

	POST /path/2130002 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.213:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 6
	Content-Type: application/x-www-form-urlencoded

tests/data/test214+1 -3

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

	</protocol>

tests/data/test217+1 -3

@@ -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
	Host: test.remote.example.com.217:%HTTPPORT
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</protocol>

tests/data/test218+1 -3

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

tests/data/test22+1 -4

@@ -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
-	User-Agent: curl/7.4.2 (sparc-sun-solaris2.7) libcurl 7.4.2 (SSL 0.9.6)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test220+1 -3

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

tests/data/test221+1 -3

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

tests/data/test222+1 -3

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

tests/data/test223+1 -3

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

tests/data/test224+1 -3

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

tests/data/test230+1 -3

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

tests/data/test232+1 -3

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

tests/data/test233+2 -3

@@ -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
	Host: first.host.it.is
	Proxy-Authorization: Basic dGVzdGluZzp0aGlz
	Authorization: Basic aWFtOm15c2VsZg==
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

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

tests/data/test234+2 -3

@@ -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
	Host: first.host.it.is
	Proxy-Authorization: Basic dGVzdGluZzp0aGlz
	Authorization: Basic aWFtOm15c2VsZg==
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

@@ -92,6 +90,7 @@ GET http://goto.second.host.now/2340002 HTTP/1.1
	Host: goto.second.host.now
	Proxy-Authorization: Basic dGVzdGluZzp0aGlz
	Authorization: Basic aWFtOm15c2VsZg==
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test239+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 0
@@ -92,7 +89,7 @@ Content-Type: application/x-www-form-urlencoded
	POST http://%HOSTIP:%HTTPPORT/239 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 6

tests/data/test24+1 -4

@@ -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
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test240+1 -3

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

	</protocol>

tests/data/test241+1 -3

@@ -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
	Host: ip6-localhost:%HTTP6PORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test242+1 -3

@@ -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
	Host: %HOST6IP:%HTTP6PORT
	Authorization: Basic Zm9vYmFyOmJhcmZvbw==
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test243+3 -6

@@ -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
	Host: %HOSTIP:%HTTPPORT
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 6
@@ -112,7 +109,7 @@ Content-Type: application/x-www-form-urlencoded
	postitPOST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 0
@@ -121,7 +118,7 @@ Content-Type: application/x-www-form-urlencoded
	POST http://%HOSTIP:%HTTPPORT/243 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 6

tests/data/test245+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
-	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: /
	Content-Length: 0
	Content-Type: application/x-www-form-urlencoded
@@ -77,7 +74,7 @@ Content-Type: application/x-www-form-urlencoded
	POST /245 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/245", response="379a439b1737ba257c1d2f103914b18b"
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 11
	Content-Type: application/x-www-form-urlencoded

tests/data/test246+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
-	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: /
	Content-Length: 0
	Content-Type: application/x-www-form-urlencoded
@@ -87,7 +84,7 @@ Content-Type: application/x-www-form-urlencoded
	POST /246 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/246", response="761e6fc9a760c39d587092e8d840e740"
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 11
	Content-Type: application/x-www-form-urlencoded

tests/data/test249+1 -3

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

tests/data/test25+6 -9

@@ -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
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /want/data/reply/25 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /want/data/reply/data/reply/25 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /want/data/reply/data/reply/data/reply/25 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /want/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/25 HTTP/1.1
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test256+1 -3

@@ -45,14 +45,12 @@ proxy
	<errorcode>
	33
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET http://%HOSTIP:%HTTPPORT/want/256 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn
	Range: bytes=78-
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test257+3 -6

@@ -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
	Host: supersite.com
	Authorization: Basic dXNlcjE6cGFzc3dkMQ==
-	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
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://anotherone.com/2570002 HTTP/1.1
	Host: anotherone.com
	Authorization: Basic dXNlcjI6cGFzc3dkMg==
-	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
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://athird.com/2570003 HTTP/1.1
	Host: athird.com
-	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
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test258+3 -3

@@ -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
	Host: remotehost:54321
-	User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 409
@@ -107,8 +107,8 @@ bar
	------------------------------7c633d5c27ce--
	POST http://remotehost:54321/we/want/258 HTTP/1.1
	Host: remotehost:54321
-	User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
	Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/258", response="2501654ca391f0b5c8c12a1da77e34cd"
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 409

tests/data/test259+3 -3

@@ -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
	Host: remotehost:54321
-	User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Expect: 100-continue
@@ -104,8 +104,8 @@ bar
	------------------------------7c633d5c27ce--
	POST http://remotehost:54321/we/want/259 HTTP/1.1
	Host: remotehost:54321
-	User-Agent: curl/7.10.4 (i686-pc-linux-gnu) libcurl/7.10.4 OpenSSL/0.9.7a ipv6 zlib/1.1.3
	Proxy-Authorization: Digest username="uuuser", realm="many secrets", nonce="911", uri="/we/want/259", response="b479994d13e60f3aa192a67c5892ddc5"
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Expect: 100-continue

tests/data/test26+1 -4

@@ -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
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test260+1 -3

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

	</protocol>

?+0 -0

tests/data/test263+1 -3

@@ -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
	Host: veryveryremotesite.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test264+1 -3

@@ -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
	Host: we.want.that.site.com
	Proxy-Authorization: Basic ZmFrZTp1c2Vy
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test265+3 -4

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

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

	POST /path/2650002 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.265:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 6
	Content-Type: application/x-www-form-urlencoded

tests/data/test266+1 -3

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

	</protocol>

tests/data/test267+2 -5

@@ -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
	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: /
	Header1: yes
	Header2: no
@@ -99,7 +96,7 @@ Content-Type: application/x-www-form-urlencoded
	POST /267 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: /
	Header1: yes
	Header2: no

tests/data/test268+1 -3

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

tests/data/test269+1 -3

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

	</protocol>

tests/data/test27+3 -3

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

	GET /want/27 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: thewinneris=nowayyouwin

	GET /want/27 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: thewinneris=nowayyouwin

tests/data/test273+2 -4

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

	GET /273 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/273", response="576ae57b1db0039f8c0de43ef58e49e3"
-	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>

tests/data/test274+1 -4

@@ -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
-	User-Agent: curl/7.8.1-pre3 (sparc-sun-solaris2.7) libcurl 7.8.1-pre3 (OpenSSL 0.9.6a) (krb4 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test275+3 -4

@@ -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
	Host: remotesite.com.275:%HTTPPORT
	Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
@@ -79,11 +76,13 @@ Proxy-Connection: Keep-Alive
	GET /we/want/that/page/275 HTTP/1.1
	Host: remotesite.com.275:%HTTPPORT
	Authorization: Basic aWFtOm15c2VsZg==
+	User-Agent: curl/%VERSION
	Accept: /

	GET /we/want/that/page/275 HTTP/1.1
	Host: remotesite.com.275:%HTTPPORT
	Authorization: Basic aWFtOm15c2VsZg==
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test276+2 -3

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

	GET /data/2760002.txt?coolsite=http://anotherurl/?a_second/2760002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test277+1 -4

@@ -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
-	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: 146
	Content-Type: text/info; boundary=------------------------

tests/data/test278+1 -3

@@ -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
	Host: we.want.that.site.com
	Proxy-Authorization: Basic ZmFrZTo=
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test279+1 -3

@@ -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
	Host: we.want.that.site.com
	Proxy-Authorization: Basic ZmFrZTo=
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test28+2 -3

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

	GET /online/1,1795,Welcome,00.html/280002.txt?logout=TRUE HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test281+1 -3

@@ -46,12 +46,10 @@ Weird
	<errorcode>
	22
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	PUT /we/want/281 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 38
	Expect: 100-continue

tests/data/test282+1 -3

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

	</protocol>

tests/data/test29+1 -3

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

	</protocol>

tests/data/test292+1 -3

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

	</protocol>

tests/data/test293+1 -3

@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/293 --max-filesize 2
	<errorcode>
	63
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /293 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test299+1 -3

@@ -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:[email protected]/we/want/299 HTTP/1.1
	Host: host.com:21
	Authorization: Basic bWljaGFsOmF5YmFidHU=
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test3+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic ZmFrZTotdXNlcg==
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 37
	Content-Type: application/x-www-form-urlencoded

tests/data/test30+1 -3

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

	</protocol>

tests/data/test300+1 -3

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

	</protocol>

tests/data/test3000+1 -3

@@ -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
	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test3001+1 -3

@@ -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
	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test3008+1 -3

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

	</protocol>

tests/data/test3009+1 -3

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

	</protocol>

tests/data/test301+1 -3

@@ -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
	Host: %HOSTIP:%HTTPSPORT
	Authorization: Basic ZmFrZTp1c2Vy
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test3011+1 -3

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

	</protocol>

tests/data/test3012+1 -3

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

	</protocol>

tests/data/test3013+2 -3

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

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

	</protocol>

tests/data/test3014+1 -3

@@ -48,11 +48,9 @@ testdata
	<protocol>
	GET /1439 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<strip>
-	^User-Agent:.*
-	</strip>
	</verify>
	</testcase>

tests/data/test3015+2 -3

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

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

	</protocol>

tests/data/test302+0 -3

@@ -43,9 +43,6 @@ HTTPS GET over HTTP proxy fails
	<errorcode>
	56
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<data>
	</data>
	</verify>

tests/data/test303+1 -3

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

	</protocol>

tests/data/test304+2 -2

@@ -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
-	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:%HTTPSPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 1386
	Content-Type: multipart/form-data; boundary=----------------------------c3b2ef7f0bb8

tests/data/test305+0 -3

@@ -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>

tests/data/test306+1 -3

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

	</protocol>

tests/data/test307+1 -3

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

	</protocol>

tests/data/test309+2 -3

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

	GET /data/3090002.txt?coolsite=yes HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test31+1 -3

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

	</protocol>

tests/data/test310+1 -3

@@ -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
	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test314+1 -3

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

tests/data/test315+1 -3

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

tests/data/test316+1 -3

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

tests/data/test317+2 -3

@@ -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
	Host: first.host.it.is
	Proxy-Authorization: Basic dGVzdGluZzp0aGlz
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Authorization: s3cr3t
@@ -89,6 +87,7 @@ Authorization: s3cr3t
	GET http://goto.second.host.now/3170002 HTTP/1.1
	Host: goto.second.host.now
	Proxy-Authorization: Basic dGVzdGluZzp0aGlz
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test318+2 -3

@@ -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
	Host: first.host.it.is
	Proxy-Authorization: Basic dGVzdGluZzp0aGlz
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Authorization: s3cr3t
@@ -89,6 +87,7 @@ Authorization: s3cr3t
	GET http://goto.second.host.now/3180002 HTTP/1.1
	Host: goto.second.host.now
	Proxy-Authorization: Basic dGVzdGluZzp0aGlz
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Authorization: s3cr3t

tests/data/test319+1 -3

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

	</protocol>

tests/data/test32+1 -4

@@ -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
-	User-Agent: curl/7.9.5 (i686-pc-linux-gnu) libcurl 7.9.5-cvs (OpenSSL 0.9.5) (ipv6 enabled)
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test325+1 -3

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

	</protocol>

tests/data/test326+1 -3

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

	</protocol>

tests/data/test327+2 -3

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

	GET /we/want/3270002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: foobar=name

tests/data/test328+1 -1

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

	</protocol>

tests/data/test329+2 -3

@@ -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
	Host: host.foo.com
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: test=no

	GET /we/want/3290002 HTTP/1.1
	Host: host.foo.com
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test33+1 -4

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Content-Range: bytes 50-99/100
-	User-Agent: curl/7.6 (sparc-sun-solaris2.7) libcurl 7.6-pre4 (SSL 0.9.6) (krb4 enabled)
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 50
	Expect: 100-continue

tests/data/test330+2 -3

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

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

tests/data/test331+2 -3

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

	GET http://moo/we/want/3310002 HTTP/1.1
	Host: moo
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive
	Cookie: moo=yes

tests/data/test334+1 -3

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

	</protocol>

tests/data/test335+3 -6

@@ -73,20 +73,17 @@ http://digest:[email protected]/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
	Host: data.from.server.requiring.digest.hohoho.com
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1
	Host: data.from.server.requiring.digest.hohoho.com
	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

@@ -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
	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"
	Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/335", response="08a2e2e684047f4219a38ddc189ac00c"
-	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
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test338+2 -3

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

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

	[DISCONNECT]

tests/data/test339+1 -3

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

	</protocol>

tests/data/test34+1 -3

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

	</protocol>

tests/data/test341+0 -3

@@ -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>

tests/data/test342+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	If-None-Match: "21025-dc7-39462498"

tests/data/test343+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	If-None-Match: "21025-dc7-39462498"

tests/data/test344+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	If-None-Match: ""

tests/data/test345+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	If-None-Match: "21025-dc7-39462498"

tests/data/test346+1 -3

@@ -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
	Host: remote.example
	Proxy-Authorization: Basic cHVzZXI6
	Authorization: Basic c3VzZXI6
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test347+1 -3

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

	</protocol>

?+0 -0

tests/data/test355+1 -3

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

	</protocol>

tests/data/test356+1 -3

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

	</protocol>

tests/data/test357+2 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 78
	Expect: 100-continue

	PUT /we/want/357 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 78

tests/data/test36+1 -3

@@ -52,12 +52,10 @@ http://%HOSTIP:%HTTPPORT/36
	<errorcode>
	56
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /36 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test37+1 -3

@@ -33,12 +33,10 @@ http://%HOSTIP:%HTTPPORT/37
	<errorcode>
	52
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /37 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test38+1 -3

@@ -41,13 +41,11 @@ download on.
	<errorcode>
	33
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /want/38 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=78-
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test39+2 -2

@@ -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
-	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: 1184
	Content-Type: multipart/form-data; boundary=----------------------------24e78000bd32

tests/data/test393+1 -3

@@ -47,12 +47,10 @@ http://%HOSTIP:%HTTPPORT/393 --max-filesize 2000000
	<errorcode>
	63
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /393 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test394+1 -3

@@ -46,12 +46,10 @@ http://%HOSTIP:%HTTPPORT/394
	<errorcode>
	8
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /394 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test395+1 -3

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

	</protocol>

tests/data/test396+1 -3

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

tests/data/test397+1 -3

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

tests/data/test4+2 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	extra-header: here
	Accept: replaced
	X-Custom-Header:
@@ -51,6 +49,7 @@ X-Test2: foo;

	GET /4 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	extra-header: here
	Accept: replaced
	X-Custom-Header:

tests/data/test40+2 -4

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

	GET /we/are/all/moo.html/?name=d+a+niel&testcase=/400002 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>

tests/data/test42+2 -4

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

	GET /we/are/all/m%20o%20o.html/420002 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>

tests/data/test43+2 -3

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

	GET http://%HOSTIP:%HTTPPORT/want/data/430002.txt?coolsite=yes HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test430+3 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	a: a
	Content-Length: 1
@@ -83,6 +81,7 @@ Content-Type: application/x-www-form-urlencoded

	aPOST /4300002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	b: b
	Content-Length: 1
@@ -90,6 +89,7 @@ Content-Type: application/x-www-form-urlencoded

	bPOST /4300003 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	c: c
	Content-Length: 1

tests/data/test431+3 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	a: a
	Content-Length: 1
@@ -77,6 +75,7 @@ Content-Type: application/x-www-form-urlencoded

	aPOST /4310002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	b: b
	Content-Length: 1
@@ -84,6 +83,7 @@ Content-Type: application/x-www-form-urlencoded

	bPOST /4310003 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	c: c
	Content-Length: 1

tests/data/test432+3 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	a: a
	Content-Length: 1
@@ -82,6 +80,7 @@ Content-Type: application/x-www-form-urlencoded

	aPOST /4320002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	b: b
	Content-Length: 1
@@ -89,6 +88,7 @@ Content-Type: application/x-www-form-urlencoded

	bPOST /4320003 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	c: c
	Content-Length: 1

tests/data/test433+1 -3

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

tests/data/test434+1 -3

@@ -35,12 +35,10 @@ http

	#
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /434 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test44+2 -2

@@ -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
-	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: 408
	Content-Type: multipart/form-data; boundary=----------------------------7c633d5c27ce

tests/data/test45+2 -3

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

	GET /want/data.cgi?moo=http://&/450002 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test46+1 -3

@@ -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
	Host: domain..tld:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: empty=; mooo2=indeed2; mooo=indeed

tests/data/test47+1 -3

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

	</protocol>

tests/data/test48+2 -3

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

	HEAD /48?foo=moo&moo=poo HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	[DISCONNECT]

tests/data/test49+2 -4

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

	GET /we/are/all/moo.html/490002 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>

tests/data/test490+2 -3

@@ -45,12 +45,10 @@ surprise!
	#
	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	PUT /490 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 10
	Expect: 100-continue
@@ -58,6 +56,7 @@ Expect: 100-continue
	surprise!
	PUT /490 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 10
	Expect: 100-continue

tests/data/test491+1 -3

@@ -45,12 +45,10 @@ surprise!
	#
	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	PUT /491 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 10
	Expect: 100-continue

tests/data/test492+4 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Testno: 492
	Content-Length: 19
@@ -62,6 +60,7 @@ Expect: 100-continue
	first 492 contents
	PUT /two/first492 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Testno: 492
	Content-Length: 19
@@ -70,6 +69,7 @@ Expect: 100-continue
	first 492 contents
	PUT /one/second492 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Testno: 492
	Content-Length: 20
@@ -78,6 +78,7 @@ Expect: 100-continue
	second 492 contents
	PUT /two/second492 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Testno: 492
	Content-Length: 20

tests/data/test5+1 -3

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

tests/data/test50+2 -4

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

	GET /we/are/moo.html/500002 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>

tests/data/test51+2 -4

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

	GET /510002 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>

tests/data/test512+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test514+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test515+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test516+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test52+2 -4

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

	GET /we/are/all/twits/520002 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>

tests/data/test522+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test523+0 -3

@@ -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
	Host: www.example.com:19999

tests/data/test53+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: mooo=indeed

tests/data/test54+1 -3

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

	</protocol>

tests/data/test540+0 -3

@@ -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
	Host: custom.set.host.name

tests/data/test544+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test547+0 -6

@@ -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
	Host: test.remote.example.com
-	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
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 36
@@ -116,7 +112,6 @@ this is the blurb we want to upload
	POST http://test.remote.example.com/path/547 HTTP/1.1
	Host: test.remote.example.com
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 0
@@ -125,7 +120,6 @@ Content-Type: application/x-www-form-urlencoded
	POST http://test.remote.example.com/path/547 HTTP/1.1
	Host: test.remote.example.com
	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-	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
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 36

tests/data/test548+0 -6

@@ -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
	Host: test.remote.example.com
-	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
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 36
@@ -116,7 +112,6 @@ this is the blurb we want to upload
	POST http://test.remote.example.com/path/548 HTTP/1.1
	Host: test.remote.example.com
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 0
@@ -125,7 +120,6 @@ Content-Type: application/x-www-form-urlencoded
	POST http://test.remote.example.com/path/548 HTTP/1.1
	Host: test.remote.example.com
	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-	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
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 36

tests/data/test549+0 -3

@@ -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
	Host: www.example.com:21

tests/data/test55+2 -4

@@ -48,17 +48,15 @@ http://%HOSTIP:%HTTPPORT/55 -L
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /55 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /

	GET /550002 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>

tests/data/test550+0 -3

@@ -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
	Host: www.example.com:21

tests/data/test551+0 -3

@@ -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
	Host: test.remote.example.com

?+0 -0

tests/data/test553+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test555+0 -6

@@ -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
	Host: test.remote.example.com
-	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
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 36
@@ -121,7 +117,6 @@ this is the blurb we want to upload
	POST http://test.remote.example.com/path/555 HTTP/1.1
	Host: test.remote.example.com
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 0
@@ -130,7 +125,6 @@ Content-Type: application/x-www-form-urlencoded
	POST http://test.remote.example.com/path/555 HTTP/1.1
	Host: test.remote.example.com
	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAADj3hs3u3j0kgJqCrLM+74BmaoNHDfIJjHRlc3R1c2VyY3VybGhvc3Q=
-	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
	Accept: /
	Proxy-Connection: Keep-Alive
	Content-Length: 36

tests/data/test556+0 -3

@@ -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
	Host: ninja

tests/data/test560+0 -3

@@ -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
	Host: %HOSTIP:%HTTPSPORT

tests/data/test561+0 -3

@@ -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
	Host: www.example.com:21

tests/data/test57+1 -3

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

	</protocol>

tests/data/test573+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test58+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 12
	Expect: 100-continue

tests/data/test580+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test581+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test585+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test589+0 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT

tests/data/test59+1 -3

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

	</protocol>

tests/data/test590+1 -6

@@ -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
	Host: test.remote.example.com
-	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
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://test.remote.example.com/path/590 HTTP/1.1
	Host: test.remote.example.com
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://test.remote.example.com/path/590 HTTP/1.1
	Host: test.remote.example.com
	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAgACAHAAAAAIAAgAcgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAIWYOdZV0iKA8ytf+dU+Bz9TpMJ4mBKu221lY3VybGhvc3Q=
-	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
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test6+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: name=contents;name2=content2

tests/data/test60+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Transfer-Encoding: chunked
	Content-Length: 1

tests/data/test61+1 -3

@@ -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
	Host: www.host.foo.com
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test62+2 -3

@@ -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
	Host: www.host.foo.com
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: test2=yes; test=yes

	GET /we/want/62?hoge=fuga HTTP/1.1
	Host: www.host.foo.com
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: test2=yes; test=yes

tests/data/test63+1 -3

@@ -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
	Host: we.want.that.site.com
	Proxy-Authorization: Basic ZmFrZTp1c2Vy
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test64+2 -4

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

	GET /64 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/64", response="c55f7f30d83d774a3d2dcacf725abaca"
-	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>

tests/data/test65+2 -4

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

	GET /65 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/65", response="66d68d3251f1839576ba7c766cf9205b"
-	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>

tests/data/test658+0 -3

@@ -38,9 +38,6 @@ http://%HOSTIP:%HTTPPORT/658
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /658 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test659+0 -3

@@ -42,9 +42,6 @@ proxy
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET http://www.example.com:80/ HTTP/1.1
	Host: www.example.com

tests/data/test66+1 -3

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

	</protocol>

tests/data/test662+2 -3

@@ -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
	Host: example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://example.net/tes%20t%20case=/6620002 HTTP/1.1
	Host: example.net
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test663+2 -3

@@ -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
	Host: example.com
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

	GET http://example.net/there/tes%20t%20case=/6630002?+yes+no HTTP/1.1
	Host: example.net
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test669+1 -4

@@ -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
-	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: 242
	Content-Type: multipart/form-data; charset=utf-8; boundary=----------------------------

tests/data/test67+2 -5

@@ -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
	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: /

	GET /67 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: /

	</protocol>

tests/data/test674+0 -3

@@ -39,9 +39,6 @@ http://%HOSTIP:%HTTPPORT/674
	</client>

	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /674 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT

tests/data/test68+2 -5

@@ -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
	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: /

	GET /68 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: /

	</protocol>

tests/data/test69+3 -6

@@ -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
	Host: %HOSTIP:%HTTPPORT
-	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: /

	GET /69 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: /

	GET /69 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: /

	</protocol>

tests/data/test7+1 -3

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

	</protocol>

tests/data/test70+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
-	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: /

	GET /70 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/70", response="2c9a6f00af0d86497b177b90e90c688a"
-	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: /

	</protocol>

tests/data/test700+1 -3

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

	</protocol>

tests/data/test701+1 -3

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

	</protocol>

tests/data/test708+1 -3

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

	</protocol>

tests/data/test709+1 -3

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

	</protocol>

tests/data/test710+1 -3

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

	</protocol>

tests/data/test717+1 -3

@@ -55,12 +55,10 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /717 HTTP/1.1
	Host: %HOSTIP:1
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test72+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
-	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: /

	GET /72 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/72", response="9fcd1330377365a09bbcb33b2cbb25bd"
-	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: /

	</protocol>

tests/data/test73+1 -3

@@ -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
	Host: host.NOT_DISCLOSED.se
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test74+2 -3

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

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

	</protocol>

tests/data/test75+0 -3

@@ -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>

tests/data/test76+0 -3

@@ -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>

tests/data/test77+1 -3

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

tests/data/test78+1 -3

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

tests/data/test79+1 -3

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

tests/data/test8+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Cookie: name with space=is weird but; trailingspace=removed; cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes

tests/data/test80+2 -5

@@ -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
	Host: test.80:%HTTPPORT
	Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
@@ -78,7 +75,7 @@ Proxy-Connection: Keep-Alive
	GET /we/want/that/page/80 HTTP/1.1
	Host: test.80:%HTTPPORT
	Authorization: Basic aWFtOm15c2VsZg==
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test81+2 -5

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Proxy-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: /
	Proxy-Connection: Keep-Alive

	GET http://%HOSTIP:%HTTPPORT/81 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-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: /
	Proxy-Connection: Keep-Alive

tests/data/test82+1 -4

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=
-	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: /
	Proxy-Connection: Keep-Alive

tests/data/test83+2 -5

@@ -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
	Host: test.83:%HTTPPORT
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
@@ -74,7 +71,7 @@ Proxy-Connection: Keep-Alive
	GET /we/want/that/page/83 HTTP/1.1
	Host: test.83:%HTTPPORT
	Authorization: Basic aWFtOm15OjtzZWxm
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test84+1 -4

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic aWFtOm15c2VsZg==
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test85+1 -4

@@ -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
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: Basic dGVzdGluZzp0aGlz
	Authorization: Basic aWFtOm15c2VsZg==
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
+	User-Agent: curl/%VERSION
	Accept: /
	Proxy-Connection: Keep-Alive

tests/data/test86+3 -6

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

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

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

	</protocol>

tests/data/test88+2 -4

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

	PUT /88 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/88", response="78a49fa53d0c228778297687d4168e71"
-	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

tests/data/test89+4 -7

@@ -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
	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: /

	GET /89 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: /

	GET /you/890010 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
+	User-Agent: curl/%VERSION
	Accept: /

	GET /you/890010 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q=
-	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
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test9+2 -2

@@ -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
-	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: 407
	Content-Type: multipart/form-data; boundary=----------------------------9ef8d6205763

tests/data/test90+6 -7

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

	GET /90 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: /

	GET /90 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: /

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

	GET /you/900010 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	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
+	User-Agent: curl/%VERSION
	Accept: /

	GET /you/900010 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAAIAAgAeAAAAAAAAAAAAAAAhoIBADYzMjE3MzIxAAAAAAAAAAAAAAAAAAAAAEcJ4YHOeb5ga2TCPwDhkyUIuHjBUHcLaHRlc3R1c2VyY3VybGhvc3Q=
-	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
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/data/test91+3 -6

@@ -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
	Host: %HOSTIP:%HTTPPORT
-	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: /

	GET /91 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: /

	GET /91 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAAIAAgAfgAAAAAAAAAAAAAAhoIBADQzMjE1MzIxAAAAAAAAAAAAAAAAAAAAAKBS3rdGYZEGsqW8otYHWXWBxC5mCuFmYm15ZG9tYWlubXlzZWxmY3VybGhvc3Q=
-	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: /

	</protocol>

tests/data/test92+1 -3

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

	</protocol>

tests/data/test93+1 -3

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

tests/data/test94+1 -4

@@ -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
-	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
	Host: test.anything.really.com:94
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</protocol>

tests/data/test95+2 -5

@@ -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
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
	Host: test.95:%HTTPPORT
+	User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
	<protocol nonewline="yes">
	POST /we/want/that/page/95 HTTP/1.1
-	User-Agent: curl/7.10.7-pre2 (i686-pc-linux-gnu) libcurl/7.10.7-pre2 OpenSSL/0.9.7a zlib/1.1.3
	Host: test.95:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 27
	Content-Type: application/x-www-form-urlencoded

tests/data/test97+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Type: silly/type
	Content-Length: 14

tests/data/test970+1 -3

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

	</protocol>

tests/data/test98+1 -3

@@ -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
	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
	Accept: /
	Content-Length: 14
	Expect: 100-continue

tests/data/test99+1 -3

@@ -55,13 +55,11 @@ http://%HOSTIP:%HTTPPORT/99 -C 9999999999
	<errorcode>
	33
	</errorcode>
-	<strip>
-	^User-Agent:.*
-	</strip>
	<protocol>
	GET /99 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=9999999999-
+	User-Agent: curl/%VERSION
	Accept: /

	</protocol>

tests/runtests.pl+4 -1

@@ -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 !~ /^\//) {