← Commit list

b5ea0736bb

Viktor Szakats

2025-12-12

SUCCESS Duration: 200s

Subject

tests/data: add XML prolog to test files

Binary

No binary (build failed)

Architecture & Compiler Flags

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

—

Build Log

(log yok)

Commit Diff GitHub →

.github/workflows/checksrc.yml+1 -5

@@ -135,11 +135,7 @@ jobs:
	persist-credentials: false

	- name: 'check'
-	run: \|
-	{
-	git grep -i -l -E '^<\?xml' -z \|\| true
-	git ls-files 'tests/data/test*' -z \|\| true
-	} \| xargs -0 -r xmllint >/dev/null
+	run: git grep -i -l -E '^<\?xml' -z \| xargs -0 -r xmllint >/dev/null

	miscchecks:
	name: 'misc checks'

tests/data/test1+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test10+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test100+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -24,7 +24,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1000+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,14 +8,12 @@ LIST
	NOBODY
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<datacheck>
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +27,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1001+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -59,7 +60,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test1002+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -58,7 +59,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test1003+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1004+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy ""
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1005+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1006+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1007+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +27,6 @@ This data will not be sent
	</file>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1008+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1009+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ TFTP RRQ
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -18,7 +18,6 @@ returned
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --local-port 44444-45444
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<strip>

tests/data/test101+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1010+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>

@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1011+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1012+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post301
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test1013+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ curl-config
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@ Compare curl --version with curl-config --protocols
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test1014+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ curl-config
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@ Compare curl --version with curl-config --features
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test1015+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -18,7 +18,6 @@ Content-Length: 0
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ content to _?!#$'\|%LT%GT
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test1016+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1017+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1018+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1019+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test102+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1020+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1021+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1022+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ curl-config
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@ Compare curl --version with curl-config --version
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test1023+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ curl-config
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@ Compare curl --version with curl-config --vernum
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test1024+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1025+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1026+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -24,7 +23,6 @@ curl --manual
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# Search for these two sentinel lines in the manual output; if they are found,

tests/data/test1027+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@ curl --help
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1028+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ FILE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1 crlf="headers">
@@ -34,7 +34,6 @@ works
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -49,7 +48,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1029+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test103+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1030+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1031+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1032+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Range
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ HTTP HEAD with --range
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1033+1 -4

@@ -1,5 +1,5 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
-	#
	# This case with an unexpected 1xx response used to cause a "hang" before the fix
	# got 7.19.0
	<info>
@@ -9,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -30,7 +29,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1034+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,12 +11,10 @@ config file
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ url = "http://invalid-utf8-%hex[%e2%90]hex%.local/page/%TESTNUMBER"
	</command>
	</client>

-	#
	<verify>
	<errorcode>
	3

tests/data/test1035+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,12 +10,10 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -34,7 +33,6 @@ http://too-long-IDN-name-c%hex[%c3%bc]hex%rl-r%hex[%c3%bc]hex%le%hex[%c3%9f]hex%
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1036+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1037+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1038+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1039+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test104+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1040+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Similar to test92
	<info>

tests/data/test1041+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Similar to test33
	<info>

tests/data/test1042+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1043+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1044+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Similar to test141
	<info>

tests/data/test1045+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -22,7 +22,6 @@ Content-Type: text/plain
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --interface %CLIENTIP
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1046+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ IPv6
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -23,7 +23,6 @@ Content-Type: text/plain
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ HTTP-IPv6 GET with numeric localhost --interface
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1047+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ LIST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -26,7 +26,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1048+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ LIST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -28,7 +28,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ FTP-IPv6 dir list PASV with localhost --interface
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1049+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ TFTP RRQ
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -18,7 +18,6 @@ returned
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --interface %CLIENTIP
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<strip>

tests/data/test105+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1050+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Similar to test 253
	<info>

tests/data/test1051+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1052+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1053+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Based on test 9
	<info>

tests/data/test1054+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -38,7 +38,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -55,7 +54,6 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @%LOGDIR/test%TESTNUMBER.txt --p
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test1055+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ STOR
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -51,7 +50,6 @@ the
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol>

tests/data/test1056+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ IPv6
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	# This test relies on the IPv6 scope field being ignored when connecting to
@@ -63,7 +62,6 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1057+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1058+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1059+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ FAILURE
	</keywords>

	</info>
-	#
	# Server-side
	<reply>
	<connect crlf="headers">
@@ -21,7 +21,6 @@ Content-Length: 0
	</connect>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,7 +38,6 @@ ftp://test-number:%TESTNUMBER/wanted/page -p -x %HOSTIP:%HTTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# The server does not implement CONNECT for ftp, so this must be a failure test

tests/data/test106+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1060+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1061+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1062+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1063+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1064+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -27,7 +28,6 @@ still ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test1065+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -28,7 +29,6 @@ still ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test1066+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1067+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1068+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Similar to test 60
	<info>

tests/data/test1069+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test107+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1070+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP POST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -22,7 +22,6 @@ skip: 2300
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ Here's 2000 x 'O':
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test1071+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Authorization is used to force curl to realize that the server is
	# speaking HTTP 1.0. The request must be resent with the correct

tests/data/test1072+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Authorization is used to force curl to realize that the server is
	# speaking HTTP 1.0. The request is impossible to satisfy with HTTP 1.0

tests/data/test1073+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Redirection is used to force curl to realize that the server is
	# speaking HTTP 1.0. The request is impossible to satisfy with HTTP 1.0

tests/data/test1074+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1075+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1076+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post302
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test1077+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -36,7 +36,6 @@ contents
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -54,7 +53,6 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1078+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ proxytunnel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect crlf="headers">
@@ -32,7 +32,6 @@ contents
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -50,7 +49,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test1079+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test108+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1080+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1081+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1082+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -22,7 +22,6 @@ Content-Type: text/plain
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface 127.0.0.1
	</precheck>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1083+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ IPv6
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -23,7 +23,6 @@ Content-Type: text/plain
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ HTTP-IPv6 GET with ip6-localhost --interface
	</precheck>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1084+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,12 +10,10 @@ non-existing host
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -28,7 +27,6 @@ http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --interface non-existing-host.haxx.se.
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1085+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,12 +11,10 @@ non-existing host
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -35,7 +34,6 @@ HTTP-IPv6 GET with invalid --interface
	</precheck>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1086+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1087+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1000 crlf="headers" nocheck="yes">
@@ -68,7 +68,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -85,7 +84,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1088+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1000 crlf="headers" nocheck="yes">
@@ -69,7 +69,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -86,7 +85,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1089+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -33,7 +33,6 @@ bigger monster

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{si
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test109+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1090+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ chunked Transfer-Encoding
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -40,7 +40,6 @@ monster

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{si
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1091+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# based on test 143
	<info>

tests/data/test1092+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP proxy
	type=
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -22,7 +22,6 @@ contents
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ FTP with type=i over HTTP proxy
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1093+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ mode=
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -18,7 +18,6 @@ returned
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ TFTP retrieve with mode=octet
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<strip>

tests/data/test1094+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ mode=
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ returned
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ TFTP retrieve with mode=netascii
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<strip>

tests/data/test1095+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1096+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1097+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1098+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ CURLOPT_PROXY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -20,7 +20,6 @@ hello

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ ftp://ftp-site/moo/%TESTNUMBER ftp://ftp-site/moo/%TESTNUMBER --proxy http://%HO
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1099+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -13,7 +14,6 @@ data for %TESTNUMBER
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +27,6 @@ tftp://%HOSTIP:%TFTPPORT/an/invalid-file tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<strip>

tests/data/test11+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test110+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1100+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1101+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1102+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1103+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1104+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1105+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1106+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1107+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1108+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1109+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Test that the fragment is not send as part of the path.
	<info>

tests/data/test111+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1110+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Test that the fragment is not send as part of the path
	# when it contains a query.

tests/data/test1111+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Test that no fragment is not send as part of the path
	# when the URI contains 2 '#' (does not follow RFC 2396)

tests/data/test1112+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# This is the ftps equivalent of test1086
	<info>

tests/data/test1113+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ flaky
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>

tests/data/test1114+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1115+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -25,7 +26,6 @@ Content-Length: 0

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test1116+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	DELAY
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -43,7 +43,6 @@ writedelay: 10
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -57,7 +56,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1117+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1118+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%[email protected]/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1119+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ symbols-in-versions
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test112+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1120+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1121+1 -3

@@ -1,10 +1,10 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	HTTP
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -17,7 +17,6 @@ blaha
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ HTTP multiple provided Host: headers
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1122+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ compressed
	Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers" nonewline="yes">
@@ -41,7 +41,6 @@ line 1

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -58,7 +57,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1123+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ compressed
	Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -40,7 +40,6 @@ Transfer-Encoding: deflate, chunked%CR

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -57,7 +56,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1124+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ Transfer-Encoding
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -42,7 +42,6 @@ line 1

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -59,7 +58,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1125+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ compressed
	Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -41,7 +41,6 @@ line 1

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -58,7 +57,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: close"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1126+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	If-Modified-Since
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -21,7 +21,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1127+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	If-Modified-Since
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -30,7 +30,6 @@ Content-Type: text/html
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1128+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	If-Modified-Since
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -31,7 +31,6 @@ Content-Type: text/html
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -z
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1129+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Expect: 100-continue
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -37,7 +37,6 @@ skip: 1053700
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	# 1053700 x 'x'
@@ -55,7 +54,6 @@ HTTP POST expect 100-continue with a 404
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test113+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1130+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Expect: 100-continue
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -38,7 +38,6 @@ skip: 100
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	# 100 x 'x'
@@ -56,7 +55,6 @@ HTTP POST forced expect 100-continue with a 404
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test1131+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Expect: 100-continue
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -38,7 +38,6 @@ skip: 100
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	# 100 x 'x'
@@ -56,7 +55,6 @@ HTTP PUT expect 100-continue with a 400
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test1133+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1134+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP HEAD
	-G
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ contents2
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u user1:password1 --next http://%HOSTIP:%H
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1135+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,13 +7,11 @@ CURL_EXTERN
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	# The VMS and OS/400 builds extract the CURL_EXTERN protos and use in
	# the build. We break binary compatibility by changing order. Only add
	# new entries last or bump the SONAME.
-	#
	<name>
	Verify CURL_EXTERN order
	</name>

tests/data/test1136+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1137+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1138+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1139+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ documentation
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test114+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1140+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ documentation
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1141+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1142+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1143+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1144+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP/0.9
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -37,7 +37,6 @@ verify
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -51,7 +50,6 @@ HTTP HEAD, receive no headers only body
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1145+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1146+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1147+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -48,7 +47,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1148+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ progressbar
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr %LOGDIR/stderrlog%TESTNUMBER
	</command>
	</client>

-	#
	<verify>
	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1

tests/data/test1149+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# based on test1010
	<info>
@@ -7,7 +8,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test115+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1150+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1151+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1152+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1153+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1154+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -23,7 +23,6 @@ Long: %repeat[102400 x A]%
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1155+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1156+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1157+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1158+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1159+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test116+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1160+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1161+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1162+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ flaky
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>

tests/data/test1163+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ flaky
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>

tests/data/test1164+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes" nonewline="yes">
@@ -14,7 +14,6 @@ swsclose%repeat[200 x %00]%
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +27,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{size_download}\n' --http0.9
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1165+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ CURL_DISABLE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1166+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1167+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ source analysis
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1168+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1169+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ runtests.pl
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test117+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1170+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ compressed
	Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -41,7 +41,6 @@ line 1

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -58,7 +57,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection:"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1171+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ compressed
	Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -41,7 +41,6 @@ line 1

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -58,7 +57,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection;"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1172+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP/0.9
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -16,7 +16,6 @@ HTTP/0.9
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-http0.9
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1173+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ documentation
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1174+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP/0.9
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -16,7 +16,6 @@ HTTP/0.9
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1175+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ symbols-in-versions
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1176+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ globbing
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o '%LOGDIR/base-#0'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1177+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ documentation
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1178+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	HTTP proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1179+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ wrong option
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	# make this test require manual as the error message is different without it
@@ -26,7 +25,6 @@ error when using unknown command line option
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test118+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1180+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1181+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1182+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ runtests.pl
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1183+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1184+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ proxytunnel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect crlf="headers">
@@ -38,7 +38,6 @@ second
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -56,7 +55,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test1185+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ checksrc
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>
@@ -86,7 +86,6 @@ void startfunc(int a, int b) {
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test1186+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1187+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ MULTIPART
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -34,7 +33,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test1188+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1189+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test119+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1190+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -17,7 +17,6 @@ hello
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -34,11 +33,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1191+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ MQTT PUBLISH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -30,11 +29,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d something
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1192+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -17,7 +17,6 @@ hello
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -34,11 +33,9 @@ mqtt://%HOSTIP:%MQTTPORT/%repeat[2048 x A]%/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1193+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ MQTT PUBLISH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -33,11 +32,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d @%LOGDIR/payload%TESTNUMBER
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1194+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -20,7 +20,6 @@ PUBLISH-before-SUBACK TRUE
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -37,11 +36,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1195+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -21,7 +21,6 @@ short-PUBLISH TRUE
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -38,11 +37,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1196+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -22,7 +22,6 @@ error-CONNACK 1
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,11 +38,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1197+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -33,7 +33,6 @@ bigger monster

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{method}\n" -L -d "twinkle twinkle lit
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1198+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -17,7 +17,6 @@ hello
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -34,11 +33,9 @@ mqtt://%HOSTIP:%MQTTPORT/%20 -d ""
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1199+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -17,7 +17,6 @@ hello
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -34,11 +33,9 @@ mqtt://%HOSTIP:%MQTTPORT -d ""
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test12+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test120+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1200+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ INDEX
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -29,7 +29,6 @@ gopher://%HOSTIP:%GOPHERPORT/1/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1201+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ SELECTOR
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -29,7 +29,6 @@ gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1202+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ QUERY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -30,7 +30,6 @@ Gopher query
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1203+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ INDEX
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -33,7 +33,6 @@ Gopher IPv6 index
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1204+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1205+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Funny-head: %repeat[18000 x A]%endofthem
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1206+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1207+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1208+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1209+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test121+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1210+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER?junk -J -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1211+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1212+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1213+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1214+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1215+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	# This test is a copy of test 67, modified to use an HTTP proxy.

tests/data/test1216+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1217+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1218+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1219+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test122+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1220+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1221+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -19,7 +19,6 @@ Content-Length: 0
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ content to _?!#$'\|%LT%GT
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test1222+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ source analysis
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1223+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# disable data check since it gets sent to stdout and is verified there
	<reply>
	<data nocheck="yes">
@@ -20,7 +20,6 @@ hej
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'IP %{remote_ip} and PORT %{remote_port}
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1224+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1225+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1226+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1227+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1228+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1229+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test123+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1230+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ IPv6
	</keywords>
	</info>

-	#
	# Server-side
	<reply>

@@ -38,7 +38,6 @@ mooooooo
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -59,7 +58,6 @@ http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/%TESTNUMBER -p -x %HOSTIP:%HT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1231+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ dotdot removal
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -27,7 +27,6 @@ Connection: close
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMB
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1232+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	# This test is a copy of test 1231, modified to use an HTTP proxy.
@@ -9,7 +10,6 @@ dotdot removal
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -29,7 +29,6 @@ Connection: close
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1233+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1234+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1235+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1236+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1237+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1238+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ DELAY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -21,7 +21,6 @@ writedelay: 2000
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER -Y1000 -y2
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<strip>

tests/data/test1239+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	-z
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "-dec 12 12:00:00 1999 GMT" -w '%{respon
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test124+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1240+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1241+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	# verify that dotdot removal can be disabled!
@@ -8,7 +9,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -28,7 +28,6 @@ Connection: close
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1242+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ TFTP RRQ
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -17,7 +17,6 @@ returned
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-no-options
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<protocol>

tests/data/test1243+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ TFTP WRQ
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -26,7 +26,6 @@ sent
	</file>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<upload>

tests/data/test1244+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	HTTP proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ wrong
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# the second request meant to fail

tests/data/test1245+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ ftp
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1246+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	# verify URL with hostname ending in pound sign
@@ -8,7 +9,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -28,7 +28,6 @@ Connection: close
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1247+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ http
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# Protocol "h1234" not supported or disabled in libcurl

tests/data/test1248+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1249+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test125+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1250+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1251+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1252+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1253+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1254+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1255+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1256+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1257+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1258+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1259+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test126+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1260+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1261+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1262+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# similar to test 139 but with a reversed time condition
	<info>

tests/data/test1263+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# similar to test 1260
	<info>

tests/data/test1264+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1265+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1266+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP/0.9
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -16,7 +16,6 @@ swsclose
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1267+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP/0.9
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -16,7 +16,6 @@ swsclose
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1268+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ warning
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1269+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@ too large --retry-delay value
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test127+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1270+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1271+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1272+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ INDEX
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -33,7 +33,6 @@ Gophers index
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1273+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# also verified by 1156 in libcurl API terms

tests/data/test1274+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ header line folding
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -26,7 +26,6 @@ Connection: %CR
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/out%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1275+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ markdown
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1276+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ documentation
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1277+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ Transfer-Encoding
	Content-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -44,7 +44,6 @@ Content-Encoding: deflate%CR

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -61,7 +60,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test1278+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-progress-meter -o %LOGDIR/out%TESTNUMB
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stderr mode="text">

tests/data/test1279+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ libcurl.def
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test128+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1280+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ globbing
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1281+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ URL
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

tests/data/test1282+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1283+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ globbing
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">

tests/data/test1284+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -45,7 +46,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test1285+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -45,7 +46,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test1286+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -58,7 +59,6 @@ Content-Length: 0

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test1287+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ proxytunnel
	verbose logs
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -47,7 +47,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -66,7 +65,6 @@ verbose-strings
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test1288+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ proxytunnel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect crlf="headers">
@@ -31,7 +31,6 @@ contents
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -49,7 +48,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test1289+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ globbing
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

tests/data/test129+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1290+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ globbing
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>

tests/data/test1291+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# This test case is primarily meant to verify that parsing and adding the 100K
	# files is a swift operation.
@@ -8,7 +9,6 @@ HTTP PUT
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

tests/data/test1292+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP added headers
	HTTP replaced headers
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ Replaced internal headers with a blank one
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1293+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ http://0 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F=
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test1294+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -49,7 +48,6 @@ http://%HOSTIP:%HTTPPORT/%repeat[30 x 012345679]%/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1295+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,7 +38,6 @@ HTTP POST with split initial request send
	</name>
	<setenv>
	# The Hound of the Baskervilles
-	#
	# make the first send cut off after this amount of data
	CURL_SMALLREQSEND=100
	</setenv>
@@ -50,7 +48,6 @@ http://%HOSTIP:%HTTPPORT/%repeat[30 x 012345679]%/%TESTNUMBER -H "%repeat[30 x 0
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test1296+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1297+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ proxytunnel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect crlf="headers">
@@ -22,7 +22,6 @@ Server: test tunnel 2000
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test1298+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ HTTP GET special path with --request-target
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1299+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ Send "OPTIONS *" with --request-target
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test13+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test130+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>

@@ -26,7 +26,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -47,7 +46,6 @@ default login userdef password passwddef
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1300+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ llist
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1301+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ curl_strequal
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<tool>

tests/data/test1302+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ base64
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1303+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Curl_timeleft_ms
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1304+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ netrc
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1305+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<!-- This replaces test 558 -->
	<info>
@@ -7,7 +8,6 @@ hash
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1306+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<!-- This replaces test 559 -->
	<info>
@@ -7,7 +8,6 @@ hash
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1307+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<!-- This replaces test 577 -->
	<info>
@@ -7,7 +8,6 @@ wildcardmatch
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1308+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FORM
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1309+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ splay
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test131+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ machine %HOSTIP login user2 password passwd2
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1310+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -23,7 +23,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/junk -J -O --show-headers --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1311+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -22,7 +22,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1312+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -22,7 +22,6 @@ Content-Disposition: inline; filename="name%TESTNUMBER;weird"
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ HTTP GET with -J, Content-Disposition and ; in filename
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1313+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -22,7 +22,6 @@ Content-Disposition: inline; filename='name%TESTNUMBER
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1314+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1315+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Based on tests 186 and 1053
	<info>

tests/data/test1316+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ HTTP CONNECT
	HTTP proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>

@@ -34,7 +34,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>

@@ -57,7 +56,6 @@ ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1317+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ HTTP with --resolve
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1318+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Content-Length: 0
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ HTTP with --resolve and same hostname using different cases
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1319+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP CONNECT
	HTTP proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>

@@ -41,7 +41,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -60,7 +59,6 @@ pop3://pop.%TESTNUMBER:%POP3PORT/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -u user:se
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test132+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ machine %HOSTIP login user2 password passwd2
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1320+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect crlf="headers">
@@ -18,7 +18,6 @@ smtp: sure hit me
	</connect>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected]
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1321+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect crlf="headers">
@@ -37,7 +37,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -56,7 +55,6 @@ IMAP FETCH tunneled through HTTP proxy
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1322+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ trailing-dot
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ HTTP with --resolve and hostname with trailing dot
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1323+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ curlx_tvdiff
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -22,7 +21,6 @@ curlx_tvdiff
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test1324+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ IPv6
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ HTTP with --resolve and [ipv6address]
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1325+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# https://greenbytes.de/tech/webdav/draft-reschke-http-status-308-latest.html
	<info>
@@ -8,7 +9,6 @@ HTTP GET
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -41,7 +41,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -55,7 +54,6 @@ http://%HOSTIP:%HTTPPORT/we/%TESTNUMBER -L -d "moo"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test1326+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ UPLOAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -16,7 +16,6 @@ moo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ telnet://%HOSTIP:%HTTPPORT --upload-file -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1327+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ UPLOAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ telnet://%HOSTIP:%HTTPPORT -T %LOGDIR/%TESTNUMBER.txt
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1328+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -37,7 +38,6 @@ Funny-head: yesyes
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -51,7 +51,6 @@ HTTP GET a globbed range with -f
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1329+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -22,7 +22,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 5 == CURLE_COULDNT_RESOLVE_PROXY

tests/data/test133+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ machine %HOSTIP login mary password drfrank
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1330+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ TrackMemory
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>
@@ -22,7 +22,6 @@ unit tests memory tracking operational
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/memdump">

tests/data/test1331+1 -2

@@ -1,8 +1,7 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Test case inspired by this question on stackoverflow:
-	#
	# https://stackoverflow.com/questions/10017165/use-libcurl-with-bluecoat-cookie-proxy
-	#
	<info>
	<keywords>
	HTTP

tests/data/test1332+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# test case cloned from 1076 and then 302 was replaced with 303
	<info>
@@ -7,7 +8,6 @@ HTTP POST
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -40,7 +40,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post303
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test1333+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -21,7 +21,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ HTTP POST zero length, chunked-encoded
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1334+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1335+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir="%LOGDIR"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1336+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1337+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1338+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER --output-
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1339+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test134+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ machine %HOSTIP login user2 password passwd2
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1340+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -22,7 +22,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER -w "curl
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1341+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -22,7 +22,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl saved to filename %{fil
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1342+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1343+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1344+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1345+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1346+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1347+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1348+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1349+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test135+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1350+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1351+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1352+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1353+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1354+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1355+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1356+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1357+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1358+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1359+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test136+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1360+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1361+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1362+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1363+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1364+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/he
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1365+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1366+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/he
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1367+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1368+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1369+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test137+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1370+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -22,7 +22,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1371+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -22,7 +22,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1372+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1373+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1374+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1375+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1376+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1377+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1378+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1379+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test138+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1380+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1381+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1382+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1383+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1384+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1385+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1386+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1387+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1388+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1389+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test139+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1390+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1391+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1392+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1393+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1394+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ unittest
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1395+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ unittest
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1396+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ curl_easy_unescape
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1397+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Curl_cert_hostcheck
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1398+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ curl_msnprintf
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1399+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Curl_pgrsTime
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test14+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test140+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1400+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1401+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1402+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1403+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1404+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Based on test 1315
	<info>

tests/data/test1405+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Derived from test227
	<info>

tests/data/test1406+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Based on test900
	# N.B. --libcurl output not sufficient to deal with uploaded files.
@@ -8,7 +9,6 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -16,7 +16,6 @@ CAPA SIZE
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ ftp
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1407+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Based on test851
	<info>
@@ -9,7 +10,6 @@ LIST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -17,7 +17,6 @@ REPLY LIST +OK %TESTNUMBER 100\r\n.
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ ftp
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1408+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ cookies
	cookiejar
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data1>
@@ -33,7 +33,6 @@ Set-Cookie: time=2
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -51,7 +50,6 @@ HTTP receive cookies over IPV6
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1409+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>
@@ -17,7 +17,6 @@ http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -C wrong
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test141+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1410+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>
@@ -17,7 +17,6 @@ http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --max-time -4
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1411+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -23,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/empty%TESTNUMBER
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1412+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1413+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/this/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1414+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1415+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1416+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ cccccccccccccccccccccccccccccccc
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1417+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ chunky-trailer: header data%CR
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1418+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1419+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test142+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1420+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Based on test800
	<info>
@@ -9,7 +10,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -23,7 +23,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ ftp
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1421+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -23,7 +23,6 @@ connection-monitor
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test1422+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=str//nge
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%FILE_PWD/%LOGDIR/name%TESTNUM
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1423+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
@@ -19,7 +19,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER file://%FILE_
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1424+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ If-Modified-Since
	-z
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -37,7 +37,6 @@ Funny-head: yesyes
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT" -o %LOGDIR/ou
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1425+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -24,7 +25,6 @@ Funny-head: yesyes

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1426+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -24,7 +25,6 @@ Funny-head: yesyes

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --output -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1427+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ integer overflow
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>
@@ -16,7 +16,6 @@ http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER -m 184467440737095510
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1428+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP Basic auth
	proxytunnel
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -57,7 +56,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test1429+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -24,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{response_code}'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers" nonewline="yes">

tests/data/test143+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1430+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -23,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1431+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -23,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1432+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -23,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1433+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -23,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1434+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1435+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1436+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1437+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1438+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1439+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test144+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1440+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1441+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1442+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1443+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -22,7 +22,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time --output-dir %LOGDIR
	# number so that it can be represented exactly on a FAT file system.
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1444+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1445+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1446+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1447+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ HTTP proxy
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -25,7 +24,6 @@ Provide illegal proxy name
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# Could not resolve proxy name

tests/data/test1448+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -32,7 +32,6 @@ OK
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -54,7 +53,6 @@ http://%hex[%c3%a5%c3%a4%c3%b6]hex%.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1449+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# initially based on test110
	<info>

tests/data/test145+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1450+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ DICT
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ dict://%HOSTIP:%DICTPORT/d:basic
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test1451+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SMB
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -13,7 +13,6 @@ Basic SMB test complete
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ Basic SMB request
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test1452+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ UPLOAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ telnet://%HOSTIP:%TELNETPORT --upload-file -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout nonewline="yes">

tests/data/test1453+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ Too long tftp filename
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -24,7 +23,6 @@ tftp://%HOSTIP:%NOLISTENPORT/%repeat[503 x a]%z
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# TFTP filename too long

tests/data/test1454+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -27,7 +26,6 @@ http
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 4 == CURLE_NOT_BUILT_IN

tests/data/test1455+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ haproxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply name="%TESTNUMBER">
	<data nocheck="yes">
@@ -27,7 +27,6 @@ Funny-head: barkbark
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test1456+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ haproxy
	IPv6
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ These data are not actually sent to the client
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# Strip off the (random) local port number. This test used to use a fixed

tests/data/test1457+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1458+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ HTTP with wildcard --resolve
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1459+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ known_hosts
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>

tests/data/test146+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1460+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 swsclose
@@ -20,7 +20,6 @@ hej
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ initial content
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# Warning: Failed to open the file log/name1460: File exists

tests/data/test1461+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -24,7 +23,6 @@ curl important --help
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1462+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@ curl invalid category --help
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1463+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ FILE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -25,7 +24,6 @@ curl file category --help
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1464+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ FILE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -25,7 +24,6 @@ curl file category --help with lower/upper mix
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1465+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1466+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -16,7 +17,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +31,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1467+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ UnixSockets
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	# --socks5 cannot accept Windows absolute paths
@@ -48,7 +47,6 @@ HTTP GET via SOCKS5 proxy via Unix sockets
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1468+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ UnixSockets
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -28,7 +28,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	# --socks5h cannot accept Windows absolute paths
@@ -49,7 +48,6 @@ http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://localhost%SOC
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1469+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test147+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1470+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ UnixSockets
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -29,7 +29,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	# --proxy cannot accept Windows absolute paths
@@ -50,7 +49,6 @@ https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER --insecure --proxy socks5h://
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1471+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ Tor
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -25,7 +24,6 @@ red.onion
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# Could not resolve hostname

tests/data/test1472+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ Tor
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -25,7 +24,6 @@ tasty.onion.
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# Could not resolve hostname

tests/data/test1473+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ header line folding
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -22,7 +22,6 @@ Content-Length: 6
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1474+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -26,7 +25,6 @@ http
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 2 failed init, the --proto argument is not accepted

tests/data/test1475+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# also verified by 1156 in libcurl API terms

tests/data/test1476+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1477+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ documentation
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1478+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ documentation
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1479+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP/0.9
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Data
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test148+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1480+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -20,7 +20,6 @@ Data
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1481+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1482+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	DELAY
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -43,7 +43,6 @@ writedelay: 10
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -57,7 +56,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1483+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	DELAY
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -45,7 +45,6 @@ writedelay: 10
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -59,7 +58,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1484+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP HEAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Transfer-Encoding: chunked
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ HTTP HEAD with response body to ignore
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1485+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1486+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ docs
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1487+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 301 OK
@@ -22,7 +22,6 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1488+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ manpages
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1489+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D % -s
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test149+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1490+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1491+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1492+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -23,7 +23,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/junk%TESTNUMBER -J -O --show-headers --output-dir %LOGD
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1493+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	DELAY
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -40,7 +40,6 @@ another-header: yes%CR
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1494+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	DELAY
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -21,7 +21,6 @@ stuff server sends

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1495+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	DELAY
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -21,7 +21,6 @@ stuff server sends

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1496+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	DELAY
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -21,7 +21,6 @@ stuff server sends

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1497+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	retry
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ ok

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 3 -o /dev/null
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1498+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Similar to test 60 and 1068
	<info>

tests/data/test1499+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -42,7 +42,6 @@ writedelay: 10
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -56,7 +55,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LO
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test15+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test150+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1500+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1501+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1502+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -25,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +42,6 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1503+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -25,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +42,6 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1504+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -25,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +42,6 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1505+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -25,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +42,6 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1506+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1507+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ multi
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1508+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1509+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test151+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1510+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1511+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1512+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1513+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1514+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1515+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	<info>

tests/data/test1516+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	<info>

tests/data/test1517+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,13 +9,11 @@ slow callback
	early response
	</keywords>
	</info>
-	#
	# This test checks to make sure curl can call recv() without failing after a
	# send() fails on the same socket (#657). Most OSes should support this
	# natively. On Windows there were reported problems and a workaround via
	# define USE_RECV_BEFORE_SEND_WORKAROUND was added.
	# This proved problematic in other cases and was removed again.
-	#
	# Server-side
	<reply>
	# Force server reply right after request headers, not waiting for request body
@@ -56,7 +55,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test1518+1 -3

@@ -1,12 +1,11 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	HTTP
	</keywords>
	</info>
-	#
	# This reproduces issue #3340
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test1519+1 -3

@@ -1,12 +1,11 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	HTTP
	</keywords>
	</info>
-	#
	# This reproduces issue #3340
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test152+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1520+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Based off test 901 after bug report #1456
	<info>
@@ -6,7 +7,6 @@ SMTP
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +36,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1521+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ curl_easy_setopt
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<tool>
@@ -17,7 +17,6 @@ Test all curl_easy_setopt and curl_easy_getinfo options
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test1522+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -22,7 +23,6 @@ Funny-head: yesyes
	-foo-
	</data>
	</reply>
-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test1523+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -21,7 +22,6 @@ AA
	writedelay: 1000
	</servercmd>
	</reply>
-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +43,6 @@ http
	</killserver>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test1524+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP PUT
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -35,7 +35,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -52,7 +51,6 @@ moo
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers" nonewline="yes">

tests/data/test1525+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1526+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1527+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1528+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1529+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test153+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -42,7 +43,6 @@ Content-Length: 23
	This IS the real page!
	</data1001>

-	#
	# This is the second request, and this sends back a response saying that
	# the request contained stale data. We want an update. Set swsbounce to
	# bounce on to data1003 on the second request.

tests/data/test1530+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1531+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1532+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -33,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1533+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1534+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ CURLINFO_FILETIME
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -35,7 +35,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1535+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -34,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1536+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -34,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1537+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ URL escape
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>
@@ -21,7 +21,6 @@ libcurl URL escape/unescape tests
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test1538+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ verbose logs
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>
@@ -25,7 +25,6 @@ libcurl strerror API call tests
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test1539+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test154+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1540+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1541+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1542+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1543+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,9 +6,7 @@ HTTP
	CURLOPT_CURLU
	</keywords>
	</info>
-	#
	# Similar to 1518 but using CURLOPT_CURLU
-	#
	# Server-side
	<reply>
	<data2 nocheck="yes">
@@ -49,7 +48,6 @@ CURLOPT_CURLU, URL with space and CURLINFO_EFFECTIVE_URL
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1544+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ source analysis
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test1545+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>
@@ -31,7 +31,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test1546+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -27,7 +27,6 @@ Server: Apache

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1547+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Based on test100 and test101
	<info>
@@ -7,7 +8,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ -P %CLIENTIP --ftp-pasv
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1548+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,14 +6,12 @@ TELNET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ GET /we/want/%TESTNUMBER HTTP/1.0
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1549+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -20,7 +20,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test155+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1550+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1551+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1552+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -25,7 +25,6 @@ body
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ lib%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test1553+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -25,7 +25,6 @@ body
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -48,7 +47,6 @@ imap://non-existing-host.haxx.se:%IMAPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test1554+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1555+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1556+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -26,7 +26,6 @@ Long: %repeat[100001 x A]%
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1557+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -22,7 +23,6 @@ hostname.invalid
	</command>
	</client>

-	#
	# Verify that the test runs to completion without crashing
	<verify>
	<errorcode>

tests/data/test1558+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -28,7 +29,6 @@ hello
	</file>
	</client>

-	#
	# Verify that the test runs to completion without crashing
	<verify>
	<errorcode>

tests/data/test1559+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -25,7 +26,6 @@ Set excessive URL lengths
	</name>
	</client>

-	#
	# Verify that the test runs to completion without crashing
	<verify>
	<errorcode>

tests/data/test156+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1560+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ urlapi
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<setenv>

tests/data/test1561+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1562+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1563+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1564+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1565+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1566+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -22,7 +22,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ downloaded already

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1567+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1568+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# based on test 64

tests/data/test1569+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test157+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1570+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1571+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_OBEYCODE
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1572+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_OBEYCODE
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1573+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_OBEYCODE
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1574+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_FIRSTONLY
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1575+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_FIRSTONLY
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1576+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_OBEYCODE
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1577+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_OBEYCODE
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1578+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_FIRSTONLY
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1579+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_OBEYCODE
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test158+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1580+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_FIRSTONLY
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1581+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ CURLFOLLOW_OBEYCODE
	CURLOPT_FOLLOWLOCATION
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test1582+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1583+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SFTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +27,6 @@ SFTP dir and empty file
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test1584+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<!-- Based on test 1311 -->
	<info>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -23,7 +23,6 @@ Content-Disposition: filename=log/server/name%TESTNUMBER
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1585+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<!-- Based on test 1584 -->
	<info>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -23,7 +23,6 @@ Content-Disposition: filename=log\server\name%TESTNUMBER
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test159+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1590+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -25,7 +25,6 @@ body
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -48,7 +47,6 @@ imap://localhost:%IMAPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test1591+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1592+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1593+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1594+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1595+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1596+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1597+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1598+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1599+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ netrc
	</info>

	# Test based on GitHub issue 17659
-	#
	# Server-side
	<reply>
	<data>
@@ -15,7 +15,6 @@ netrc
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ default passwor?dlogin anonymou\ ' password login anonymous passwor?d.'m
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test16+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test160+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1600+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ NTLM
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1601+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MD5
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1602+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ hash
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1603+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ hash
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1604+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ unittest
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1605+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ unittest
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1606+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ speedcheck
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1607+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ CURLOPT_RESOLVE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1608+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ curlopt_dns_shuffle_addresses
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1609+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ CURLOPT_RESOLVE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test161+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1610+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ SHA256
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1611+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MD4
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1612+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HMAC
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1613+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -22,7 +22,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>

tests/data/test1614+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ noproxy
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1615+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ SHA-512/256
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1616+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ uint_hash
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1617+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ compressed
	Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -41,7 +41,6 @@ line 1

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -58,7 +57,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: this" -H "Con
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test162+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1620+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ URL
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1621+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ stripcredentials
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test163+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1630+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1631+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1632+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1633+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ RETRY-AFTER
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -52,7 +52,6 @@ Connection: close
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -66,7 +65,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -d moo --retry 1 -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test1634+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ RETRY-AFTER
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -38,7 +38,6 @@ hey
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -52,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1 --fail
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1635+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ RETRY-AFTER
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ hey

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1 --fail-with-body
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test164+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test165+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ IDN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -21,7 +21,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://www.%hex[%c3%a5%c3%a4%c3%b6]hex%.se/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1650+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ DOH
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1651+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ x509
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1652+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1653+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1654+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1655+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ DOH
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1656+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Curl_x509_GTime2str
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1657+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Curl_x509_getASN1Element
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1658+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ httpsrr
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test166+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1660+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1661+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ bufref
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1662+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -33,7 +33,6 @@ Funny-head: nono
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>

tests/data/test1663+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ bind
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1664+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ strparse
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test167+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1670+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%header{etag} %header{nope} %header{DAT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1671+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -30,7 +30,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{header_json}\n' -o %LOGDIR/%TESTNUMBE
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test168+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1680+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -20,7 +20,6 @@ foo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -40,7 +39,6 @@ to be overwritten
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/exist%TESTNUMBER">

tests/data/test1681+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -20,7 +20,6 @@ foo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -40,7 +39,6 @@ to stay the same
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/exist%TESTNUMBER">

tests/data/test1682+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -20,7 +20,6 @@ foo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -40,7 +39,6 @@ to stay the same
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/exist%TESTNUMBER">

tests/data/test1683+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -20,7 +20,6 @@ foo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -43,7 +42,6 @@ to stay the same
	</precheck>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test169+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test17+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -26,13 +27,10 @@ http
	HTTP with config file on stdin
	</name>
	<stdin>
-	#
	# Use a silly request without '--':
	request MOOO
-	#
	# Set the user-agent using a short-option:
	-A "agent007 license to drill\t"
-	#
	# long option with '--':
	--max-time 180
	</stdin>

tests/data/test170+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1700+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP/2
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -35,7 +35,6 @@ Content-Type: text/html
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -52,7 +51,6 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 http://%HOSTIP:%HTTP2PORT/%TESTNUM
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strip>

tests/data/test1701+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP/2
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 -d "datatosend"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strip>

tests/data/test1702+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP/2
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 --head
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strip>

tests/data/test1703+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1704+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP/2
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -23,7 +23,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strip>

tests/data/test1705+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ managen
	</keywords>
	</info>

-	#
	# Client-side
	<client>

tests/data/test1706+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ managen
	</keywords>
	</info>

-	#
	# Client-side
	<client>

tests/data/test1707+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ curl
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1708+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ curl
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1709+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ curl
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test171+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1710+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ curl
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1711+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test172+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test173+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test174+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -21,7 +22,6 @@ This is not the real page

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test175+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -45,7 +46,6 @@ content for you

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test176+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test177+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -21,7 +22,6 @@ Content-Type: text/html; charset=iso-8859-1

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test178+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test179+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test18+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test180+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1800+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1801+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1802+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -25,7 +26,6 @@ Content-Length: 0
	</connect>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +43,6 @@ http://hello/wanted/page -p -x %HOSTIP:%HTTPPORT --header "User-Agent: myapp/1.0
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>

tests/data/test181+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test182+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test183+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test184+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test185+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test186+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test187+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test188+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test189+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test19+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test190+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1900+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1901+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1902+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1903+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1904+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ proxytunnel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -40,7 +40,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -58,7 +57,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test1905+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1906+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1907+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1908+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1909+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ retry
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -26,7 +26,6 @@ data
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ HTTP GET --retry-all-errors to overcome partial transfer
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test191+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1910+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1911+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1912+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1913+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1914+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1915+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1916+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT PUBLISH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -17,7 +17,6 @@ hello
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -37,11 +36,9 @@ lib%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1917+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT PUBLISH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -17,7 +17,6 @@ hello
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>

@@ -40,11 +39,9 @@ lib1916
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test1918+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1919+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test192+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -19,7 +19,6 @@ monster
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test193+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -31,7 +31,6 @@ monster

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1933+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1934+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1935+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1936+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1937+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1938+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1939+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test194+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1940+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1941+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1942+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1943+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1944+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1945+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1946+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1947+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1948+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test195+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1955+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1956+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1957+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1958+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1959+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test196+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1960+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1964+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test197+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	retry
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ ok

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1970+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1971+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1972+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1973+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1974+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1975+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1976+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1977+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1978+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test1979+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ aws-sigv4
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test198+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	retry
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -36,7 +36,6 @@ ok

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -50,7 +49,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test1980+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ aws-sigv4
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test1981+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out='Time: %time{%d/%b/%Y %H:%M:%S.
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test199+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	globbing
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ HTTP with -d, -G and {}
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	HTTP Basic auth
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -19,7 +19,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ HTTP GET with user and password
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test20+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test200+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2000+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ multiprotocol
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -21,7 +21,6 @@ works
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ moo
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test2001+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ multiprotocol
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1 crlf="headers" nocheck="yes">
@@ -37,7 +37,6 @@ works
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -60,7 +59,6 @@ moo
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test2002+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -12,7 +13,6 @@ multiprotocol
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1 crlf="headers" nocheck="yes">
@@ -45,7 +45,6 @@ returned
	</data3>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -69,7 +68,6 @@ moo
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strip>

tests/data/test2003+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -12,7 +13,6 @@ multiprotocol
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1 crlf="headers" nocheck="yes">
@@ -45,7 +45,6 @@ returned
	</data3>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -76,7 +75,6 @@ moo
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strip>

tests/data/test2004+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ multiprotocol
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -19,7 +19,6 @@ for tftp test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ for several protocols
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strip>

tests/data/test2005+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ machine example.com
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test201+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test202+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2023+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2024+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2025+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2026+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2027+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2028+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2029+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test203+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2030+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2031+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2032+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2033+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ CURL_SSL_BACKEND=schannel
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2034+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ simple HTTPS GET with DER public key pinning
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2035+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -31,7 +30,6 @@ HTTPS wrong DER pinnedpubkey but right CN
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test2037+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ simple HTTPS GET with PEM public key pinning
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2038+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -31,7 +30,6 @@ HTTPS wrong PEM pinnedpubkey but right CN
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test2039+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ machine %HOSTIP login user2 password passwd2
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test204+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2040+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2041+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ simple HTTPS GET with base64-sha256 public key pinning
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2042+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -31,7 +30,6 @@ HTTPS wrong base64-sha256 pinnedpubkey but right CN
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test2043+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>
@@ -20,7 +20,6 @@ Disable certificate revocation checks
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test2044+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>
@@ -16,7 +16,6 @@ Attempt to set a default protocol that does not exist
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# CURLE_UNSUPPORTED_PROTOCOL is error code 1

tests/data/test2045+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	# The purpose of this test is to make sure the --proto-default option works
@@ -23,7 +23,6 @@ REPLY welcome HTTP/1.1 200 OK\r\nContent-Length: 21\r\n\r\n500 Weird FTP Reply
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ Set the default protocol to ftp for a schemeless URL
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# CURLE_WEIRD_SERVER_REPLY is error code 8

tests/data/test2046+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -32,7 +32,6 @@ OK
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -54,7 +53,6 @@ http://%hex[%c3%a5%c3%a4%c3%b6]hex%.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2047+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -32,7 +32,6 @@ OK
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -55,7 +54,6 @@ http://%hex[%c3%a5%c3%a4%c3%b6]hex%.se/%TESTNUMBER -x %HOSTIP:%HTTPPORT -w "%{nu
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2048+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -30,7 +29,6 @@ pinnedpubkey no-match must fail even when insecure
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test2049+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ CURLOPT_CONNECT_TO
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ OK
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://www4.example.com:8084/%TESTNUMBER --connect-to www4.example.com:8084:%HOS
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test205+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2050+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ CURLOPT_CONNECT_TO
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect>
@@ -39,7 +39,6 @@ OK
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -58,7 +57,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test2051+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ CURLOPT_CONNECT_TO
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -20,7 +20,6 @@ OK
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2052+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CURLOPT_CONNECT_TO
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -21,7 +21,6 @@ OK
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://www.example.com:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2053+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ CURLOPT_CONNECT_TO
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ OK
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ http://[fc00::1]:8082/%TESTNUMBER --connect-to [fc00::1]:8082:%HOSTIP:%HTTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2054+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ CURLOPT_CONNECT_TO
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ OK
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -49,7 +48,6 @@ http://www.example.com:8084/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2055+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ SOCKS5
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect>
@@ -40,7 +40,6 @@ OK
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -59,7 +58,6 @@ http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.co
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test2056+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2057+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2058+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -59,7 +60,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test2059+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -59,7 +60,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test206+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2060+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -59,7 +60,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test2061+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2062+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2063+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2064+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2065+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2066+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2067+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -45,7 +46,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test2068+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -45,7 +46,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test2069+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -45,7 +46,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test207+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ FAILURE
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -31,7 +31,6 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2070+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>type

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ CURL_SSL_BACKEND=schannel
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2071+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2072+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2073+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP FORMPOST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ contents2
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=a;filename=a.pdf' --next http://%H
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strip>

tests/data/test2074+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ AUTH OAUTHBEARER
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --oauth2-bearer mF_9.B5f-4.1JqM
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2075+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>
@@ -20,7 +20,6 @@ Verify usernames are not allowed in url
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# CURLE_LOGIN_DENIED is code 67

tests/data/test2076+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2077+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2078+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2079+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ CURL_SSL_BACKEND=schannel
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test208+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2080+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ config
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -26,7 +25,6 @@ config file with overly long option
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# the used option in the config file is too long

tests/data/test2081+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2082+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2083+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2084+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2085+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2086+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2087+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ CURL_SSL_BACKEND=schannel
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2088+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Client Auth
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,7 +38,6 @@ HTTPS GET with client authentication (mtls)
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2089+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Client Auth
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,7 +38,6 @@ HTTPS GET with client authentication (mtls) and --insecure
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test209+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2090+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ TLS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ HTTPS request with SSLKEYLOGFILE set
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test21+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test210+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2100+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ httpsrr
	</keywords>
	</info>

-	#
	# Server-side
	<reply>

@@ -37,7 +37,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -60,7 +59,6 @@ http://foo.example.com:%HTTPPORT/%TESTNUMBER --doh-url http://%HOSTIP:%HTTPPORT/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>

tests/data/test2101+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ DOH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>

@@ -16,7 +16,6 @@ idle
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ http://neverreached.example.com/ --doh-url http://%HOSTIP:%HTTPPORT/%TESTNUMBER0
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>

tests/data/test2102+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -29,7 +29,6 @@ AAAA: %HOST6IP
	</dns>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -50,7 +49,6 @@ http://examplehost.example:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2103+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ DNS fail
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<dns>
@@ -14,7 +14,6 @@ AAAA: none
	</dns>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://examplehost.example/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# curl: (6) Could not resolve host: examplehost.example

tests/data/test2104+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,14 +6,12 @@ DNS cache
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<dns>
	</dns>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ http://examplehost.example/%TESTNUMBER http://examplehost.example/%TESTNUMBER ht
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# curl: (6) Could not resolve host: examplehost.example

tests/data/test211+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test212+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test213+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test214+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ MSYS2_ARG_CONV_EXCL=http://
	</setenv>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test215+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test216+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test217+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test218+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP PUT
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -19,7 +19,6 @@ blaha
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ just some tiny teeny contents
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol>

tests/data/test219+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ unsupported scheme
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -26,7 +25,6 @@ try using proxy with unsupported scheme
	</command>
	</client>

-	#
	# Verify after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test22+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test220+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	compressed
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -38,7 +38,6 @@ line 1

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -55,7 +54,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test2200+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -22,7 +22,6 @@ error-CONNACK 5
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,11 +38,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -u fakeuser:fakepasswd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test2201+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ MQTT PUBLISH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -30,11 +29,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d something -u testuser:testpasswd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test2202+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT PUBLISH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -18,7 +18,6 @@ error-CONNACK 5
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -35,11 +34,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d something -u fakeuser:fakepasswd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test2203+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -22,7 +22,6 @@ error-CONNACK 5
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,11 +38,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test2204+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -17,7 +17,6 @@ hello
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -34,11 +33,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -u testuser:testpasswd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test2205+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -33,7 +32,6 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -K %LOGDIR/input%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 8 is CURLE_WEIRD_SERVER_REPLY

tests/data/test221+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ compressed
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers" nonewline="yes">
@@ -38,7 +38,6 @@ Content-Length: 41

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -55,7 +54,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test222+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	compressed
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -38,7 +38,6 @@ Content-Length: 1305%CR

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -55,7 +54,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test223+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ compressed
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	# this deflate chunk has three bytes removed from the beginning and is cut
@@ -37,7 +37,6 @@ Content-Length: 1305

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test224+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	compressed
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -35,7 +35,6 @@ uncompressed gzip data with long gzip header

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -52,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test225+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test226+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test227+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test228+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test229+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test23+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test230+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	compressed
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -38,7 +38,6 @@ Content-Length: 1328%CR

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -55,7 +54,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test2300+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ WebSockets
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -22,7 +22,6 @@ upgrade
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	# require Debug for the forced CURL_ENTROPY
@@ -44,7 +43,6 @@ WebSockets upgrade only
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers" nocheck="yes">

tests/data/test2301+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ WebSockets
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes" nonewline="yes">
@@ -24,7 +24,6 @@ upgrade
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	# require Debug for the forced CURL_ENTROPY
@@ -49,7 +48,6 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes" nocheck="yes">

tests/data/test2302+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ WebSockets
	</keywords>
	</info>

-	#
	# Sends a PING + a 5 byte hello TEXT
	<reply>
	<data crlf="headers" nocheck="yes" nonewline="yes">
@@ -24,7 +24,6 @@ upgrade
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	# require Debug for the forced CURL_ENTROPY
@@ -49,9 +48,7 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# PONG with no data and the 32-bit mask
-	#
	<verify>
	<protocol crlf="yes" nonewline="yes" nocheck="yes">
	GET /%TESTNUMBER HTTP/1.1

tests/data/test2303+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ WebSockets
	</keywords>
	</info>

-	#
	<reply>
	<data crlf="headers" nocheck="yes" nonewline="yes">
	HTTP/1.1 200 Oblivious
@@ -17,7 +17,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	# require Debug for the forced CURL_ENTROPY

tests/data/test2304+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ WebSockets
	</keywords>
	</info>

-	#
	# Close connection during websocket upgrade
	<reply>
	<data nocheck="yes" nonewline="yes">
@@ -23,7 +23,6 @@ upgrade
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	# require Debug for the forced CURL_ENTROPY
@@ -48,9 +47,7 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# PONG with no data and the 32-bit mask
-	#
	<verify>
	<protocol crlf="headers" nocheck="yes">
	GET /%TESTNUMBER HTTP/1.1

tests/data/test2306+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# This reproduces the #11101 issue, when the second response comes back
	# with the first header being "folded"
	<reply>
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2307+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2308+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# This reproduces the #13669 issue
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -41,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2309+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ netrc
	HTTP
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>

tests/data/test231+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test232+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	compressed
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -38,7 +38,6 @@ Content-Length: 1287%CR

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -55,7 +54,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test233+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP proxy Basic auth
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -55,7 +55,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -72,7 +71,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test234+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -57,7 +57,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -74,7 +73,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test235+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test236+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test237+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test238+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test239+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test24+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test240+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	IPv6
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -42,7 +41,6 @@ HTTP-IPv6 GET
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2400+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTPS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -23,7 +23,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -46,7 +45,6 @@ HTTP/2 GET over HTTPS

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test2401+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTPS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -21,7 +21,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ HTTP/2 POST over HTTPS

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test2402+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2403+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ HTTPS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ HTTP/2 GET using %{header_json}

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test2404+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2405+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2406+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTPS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -23,7 +23,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ HTTP/2 over HTTPS with -f

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test2407+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test241+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ IPv6
	IPv6-hostname
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ HTTP-IPv6 GET (using ip6-localhost)
	</precheck>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test242+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ IPv6
	HTTP Basic auth
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -37,7 +36,6 @@ HTTP-IPv6 GET with username+password in URL
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test243+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test244+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CWD
	nocwd
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">

tests/data/test245+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -45,7 +46,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test246+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -55,7 +56,6 @@ ok

	# Client-side
	<client>
-	#
	<server>
	http
	</server>

tests/data/test247+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test248+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test249+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	-z
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -23,7 +23,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test25+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test250+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ SLOWDOWN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	# When doing LIST, we get the default list output hard-coded in the test
@@ -29,7 +29,6 @@ SLOWDOWN
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ ftp://%HOSTIP:%FTPPORT/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test2500+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP/3
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ HTTP/3 GET:
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strip>

tests/data/test2501+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTPS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -21,7 +21,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ HTTP/3 POST

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test2502+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2503+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ HTTPS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -46,7 +45,6 @@ HTTP/3 header-api

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test251+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test252+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ IPv6
	EPSV
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -42,7 +41,6 @@ FTP IPv6 dir list PASV
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test253+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ IPv6
	EPRT
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -42,7 +41,6 @@ FTP IPv6 dir list with EPRT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test254+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ EPSV
	--disable-epsv
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -26,7 +26,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ FTP IPv6 dir list PASV and --disable-epsv
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test255+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ EPRT
	--disable-eprt
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -26,7 +26,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ FTP IPv6 dir list with EPRT and --disable-eprt
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test256+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test257+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test258+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test259+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test26+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test260+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ HTTP GET URL without slash but with question mark
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test2600+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ timing-dependent
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test2601+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ bufq
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test2602+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ dynhds
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test2603+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ http1
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test2604+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ unittest
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test2605+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ sftp
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test261+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ EPSV
	RETR
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -17,7 +17,6 @@ REPLY TYPE 226 Kind of on the positive side!
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test262+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ hello

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test263+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ IPv6
	HTTP proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -38,7 +37,6 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test264+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test265+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test266+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	DELAY
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -43,7 +43,6 @@ writedelay: 10
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -57,7 +56,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test267+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test268+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable hello@%LOGDIR/junk --expand-data
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test269+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -23,7 +23,6 @@ muahahaha
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --ignore-content-length
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test27+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test270+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2700+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2701+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2702+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2703+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2704+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2705+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2706+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2707+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2708+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2709+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test271+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ TFTP RRQ
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -17,7 +17,6 @@ returned
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<strip>

tests/data/test2710+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2711+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2712+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2713+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2714+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2715+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2716+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2717+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2718+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2719+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test272+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2720+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2721+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2722+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test2723+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test273+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test274+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test275+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ proxytunnel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect crlf="headers">
@@ -43,7 +43,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -61,7 +60,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test276+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test277+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test278+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test279+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test28+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test280+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	--ftp-alternative-to-user
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -29,7 +29,6 @@ COUNT USER 1
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test281+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test282+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -15,7 +15,6 @@ HTTP/1.1 200 OK swsclose
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test283+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -21,7 +21,6 @@ tftp://%HOSTIP:%TFTPPORT//invalid-file --tftp-blksize 1024
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test284+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ TFTP RRQ
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -41,7 +41,6 @@ condition in the TFTP receive code.
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -55,7 +54,6 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<strip>

tests/data/test285+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ TFTP WRQ
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -26,7 +26,6 @@ sent
	</file>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<upload>

tests/data/test286+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ TFTP WRQ
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -50,7 +50,6 @@ condition in the TFTP transmit code.
	</file>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<upload>

tests/data/test287+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test288+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test289+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test29+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test290+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test291+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test292+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 1000
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test293+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test294+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ ACCT
	--ftp-account
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -30,7 +30,6 @@ REPLY ACCT 230 Thank-you for the ACCT
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test295+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ ACCT
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<servercmd>
@@ -17,7 +17,6 @@ REPLY PWD 530 No ACCT, go away
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test296+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CWD
	multicwd
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>

tests/data/test297+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CWD
	singlecwd
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>

tests/data/test298+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CWD
	nocwd
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>

tests/data/test299+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	HTTP Basic auth
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Content-Length: 0
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ HTTP POST with auth and contents but with content-length set to 0
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test30+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test300+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -37,7 +36,6 @@ simple HTTPS GET
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3000+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,7 +38,6 @@ HTTPS localhost, first subaltname matches, CN does not match
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3001+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,7 +38,6 @@ HTTPS localhost, last subject alt name matches, CN does not match
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3002+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test3003+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test3004+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test3005+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test3006+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test3007+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test3008+1 -3

@@ -1,10 +1,10 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	-O
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -23,7 +23,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3009+1 -3

@@ -1,10 +1,10 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	-O
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -23,7 +23,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/not-there
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test301+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP Basic auth
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -37,7 +36,6 @@ HTTPS GET with user and password
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3010+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3011+1 -3

@@ -1,10 +1,10 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	-O
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -23,7 +23,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR/tm
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3012+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@
	--remote-time
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJR --output-dir %PWD/%LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3013+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@
	--output-dir
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR ht
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3014+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3015+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ chunked Transfer-Encoding
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -40,7 +40,6 @@ monster

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_headers}\n" -L -o%DEV_NULL
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3016+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FILE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -25,7 +25,6 @@ file://%FILE_PWD/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test3017+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -20,7 +20,6 @@ excessive-remaining TRUE
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -37,11 +36,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -m 3
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test3018+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ MQTT SUBSCRIBE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -18,7 +18,6 @@ hello
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -35,11 +34,9 @@ mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER --max-filesize 11
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# These are hexadecimal protocol dumps from the client
-	#
	# Strip out the random part of the client id from the CONNECT message
	# before comparison
	<strippart>

tests/data/test3019+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -26,7 +25,6 @@ HTTP with invalid --resolve syntax
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test302+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -37,7 +38,6 @@ HTTPS GET over HTTP proxy fails
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test3020+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -26,7 +25,6 @@ HTTP with invalid --connect-to syntax
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test3021+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SHA256
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -15,7 +15,6 @@ test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	# so far only the libssh2 backend supports SHA256
@@ -41,7 +40,6 @@ test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test3022+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SHA256
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -15,7 +15,6 @@ test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	# so far only the libssh2 backend supports SHA256
@@ -41,7 +40,6 @@ test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test3023+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ CURL_SSL_BACKEND=schannel
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3024+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -43,7 +42,6 @@ CURL_SSL_BACKEND=schannel
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3025+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -17,7 +17,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test3026+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ slow
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	# require the threaded resolver only because it means pthreads might
@@ -29,7 +28,6 @@ lib%TESTNUMBER
	</tool>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test3027+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3028+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP CONNECT
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<connect>
@@ -27,7 +27,6 @@ haha

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test3029+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test303+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3030+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3031+1 -3

@@ -1,10 +1,10 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	--dump-header
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -23,7 +23,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER --dump-header %PWD/%LOGDIR/tmp/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3032+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3033+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ libtest
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Content-Length: 6
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test3034+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3035+1 -10

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -12,9 +13,7 @@ retry
	# Server-side
	<reply>

-	#
	# the first chunk
-	#
	<data crlf="headers" nocheck="yes" nonewline="yes">
	HTTP/1.1 200 OK swsbounce swsclose
	Accept-Ranges: bytes
@@ -24,9 +23,7 @@ Content-Length: 26
	abcde
	</data>

-	#
	# the second chunk
-	#
	<data1 crlf="headers" nocheck="yes" nonewline="yes">
	HTTP/1.1 206 Partial Content swsbounce swsclose
	Content-Type: text/html
@@ -36,9 +33,7 @@ Content-Range: bytes 5-25/26
	fghijk
	</data1>

-	#
	# some nonsense that curl should ignore as unresumable
-	#
	<data2 crlf="headers" nocheck="yes">
	HTTP/1.1 404 Not Found swsbounce
	Content-Type: text/html
@@ -47,9 +42,7 @@ Content-Length: 5
	body
	</data2>

-	#
	# some more nonsense that curl should ignore as unresumable
-	#
	<data3 crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK swsbounce
	Accept-Ranges: bytes
@@ -59,9 +52,7 @@ Content-Length: 30
	XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
	</data3>

-	#
	# the third chunk
-	#
	<data4 nocheck="yes" nonewline="yes">
	HTTP/1.1 206 Partial Content swsbounce swsclose
	Content-Type: text/html

tests/data/test304+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test305+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test306+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -32,7 +32,6 @@ verify
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -49,7 +48,6 @@ HTTPS GET, receive no headers only data!
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test307+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ simple HTTPS GET with openssl engine
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test308+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>
@@ -25,7 +25,6 @@ simple HTTPS GET with invalid crypto engine
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test309+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test31+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ cookiejar
	</keywords>
	</info>
	# Server-side
-	#

	<reply>
	<data>

tests/data/test310+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,7 +38,6 @@ simple HTTPS GET
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3100+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	#Informational

tests/data/test3101+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3102+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	# SSL with libraries supporting CURLOPT_CERTINFO
@@ -35,7 +34,6 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3103+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3104+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3105+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ curl_multi_remove_handle
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<tool>
@@ -19,7 +19,6 @@ curl_multi_remove_handle twice
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test311+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -30,7 +29,6 @@ HTTPS wrong subjectAltName but right CN
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test312+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -30,7 +29,6 @@ HTTPS GET to localhost and null-prefixed CN cert
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test313+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CRL
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>
@@ -28,7 +28,6 @@ CRL test
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test314+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	compressed
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -40,7 +40,6 @@ Content-Length: 1056%CR

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -57,7 +56,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test315+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ compressed
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	# this brotli chunk has three bytes removed from the beginning and is cut off
@@ -37,7 +37,6 @@ Content-Length: 1056

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test316+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	compressed
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	# Length of not-encoded content is 16512 what is greater than default value of
@@ -37,7 +37,6 @@ Content-Length: 31

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test317+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP proxy Basic auth
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -55,7 +55,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -72,7 +71,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test318+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP proxy Basic auth
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -55,7 +55,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -72,7 +71,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test319+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Transfer-Encoding
	--raw
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -31,7 +31,6 @@ Content-Length: 44

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test32+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	-G
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ HTTP with -d and -G
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test320+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3200+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ curl_get_line
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test3201+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ haproxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply name="%TESTNUMBER">
	<data nocheck="yes">
@@ -27,7 +27,6 @@ Funny-head: barkbark
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test3202+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ haproxy
	IPv6
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ These data are not actually sent to the client
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# Strip off the (random) local port number. This test used to use a fixed

tests/data/test3203+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FILE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +28,6 @@ Contents of file are irrelevant
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test3204+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -18,7 +18,6 @@ ETag: "21025-dc7-39462498"
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>

tests/data/test3205+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ cipher_suite
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test3206+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ CUSTOMREQUEST
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ IMAP custom FETCH with larger literal response (~7KB)
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test3207+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3208+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	libtest
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -43,7 +43,6 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test3209+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ UPLOAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test321+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test3210+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ UPLOAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test3211+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ uint_bset
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test3212+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ uint_bset
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test3213+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ uint_spbset
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test3214+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ size
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test3215+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SMTP DSN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	# Special Replies, so the server does not have to understand DSN
@@ -15,7 +15,6 @@ REPLY RCPT 250 Ok
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt "%[email protected]%GT NO
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test3216+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ ratelimit
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>

tests/data/test322+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test323+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test324+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test325+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -29,7 +29,6 @@ Location: http://somewhere/%TESTNUMBER
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -46,7 +45,6 @@ HTTPS with attempted redirect to denied HTTP
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test326+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -36,7 +36,6 @@ line 1

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -50,7 +49,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test327+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test328+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test329+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test33+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test330+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ followlocation
	cookies
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -54,7 +54,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -71,7 +70,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test331+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test332+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -16,7 +17,6 @@ returned
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +30,6 @@ tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --tftp-blksize 400
	</command>
	</client>

-	#
	# Verify pseudo protocol after the test has been "shot"
	<verify>
	<strip>

tests/data/test333+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ cmdline
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@ Try a non-boolean command line option with --no-
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# detected the bad --no- prefix

tests/data/test334+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test335+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Mostly a duplicate of test168
	<info>

tests/data/test336+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test337+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test338+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# See https://github.com/curl/curl/issues/4499
	<info>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -28,7 +28,6 @@ connection-monitor
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test339+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -29,7 +29,6 @@ chunky-trailer: header data%CR
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test34+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -35,7 +35,6 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -49,7 +48,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test340+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CWD
	singlecwd
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>

tests/data/test341+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -29,7 +29,6 @@ chunky-trailer: header data
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test342+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test343+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test344+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test345+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test346+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -42,7 +41,6 @@ HTTP GET over proxy with credentials using blank passwords
	</command>
	</client>

-	#
	<verify>
	<protocol crlf="headers">
	GET http://remote.example/%TESTNUMBER HTTP/1.1

tests/data/test347+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -29,7 +29,6 @@ chunky-trailer: header data%CR
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test348+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test349+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test35+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test350+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -24,7 +24,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method multicwd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test351+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -24,7 +24,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method nocwd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test352+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -24,7 +24,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method singlecwd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test353+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -24,7 +24,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ ftp://%HOSTIP:%FTPPORT/ --ftp-method singlecwd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test354+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test355+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Alt-Svc
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -21,7 +21,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test356+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Alt-Svc
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Alt-Svc: h1="nowhere.foo:70000"
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test357+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test358+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP/2
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -52,7 +51,6 @@ h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test359+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP/2
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -52,7 +51,6 @@ h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test36+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -32,7 +32,6 @@ a
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test360+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test361+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test362+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test363+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ proxytunnel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -64,7 +63,6 @@ http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%P
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test364+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test365+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -37,7 +37,6 @@ chunked data fun
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -51,7 +50,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test366+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	retry
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ server not available

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 2 --retry-max-time 10
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test367+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP Basic auth
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ http://:example@%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test368+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Range
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -r 4
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test369+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ etag
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ hej
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/nowhere/etag%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test37+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ HTTP GET
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test370+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ etag
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -23,7 +22,6 @@ http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --etag-save %LOGDIR/nowhere/etag%TESTNU
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test371+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/dump -o %LOGDIR/dump2 --no-progr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test372+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test373+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test374+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test375+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -17,7 +18,6 @@ Disabled proxy should make curl fail with --proxy
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stderr mode="text">

tests/data/test376+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Crafted to cause error 18
	<reply>
	<data nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-err
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test378+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ HTTP POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -22,7 +21,6 @@ Reject using -T and -d at once
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test379+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Crafted to cause error
	<reply>
	<data nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<file name="%LOGDIR/save">
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clob
	</command>
	</client>

-	#
	# Verify data after the test has been "shot".
	<verify>
	<errorcode>

tests/data/test38+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test380+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ machine %HOSTIP login mary password yram
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test381+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ ftp

	# When CURL_NETRC_REQUIRED is set, the password in the URL is ignored and
	# using the netrc is mandatory.
-	#
	<name>
	netrc-optional lets URL creds override netrc
	</name>
@@ -49,7 +47,6 @@ machine %HOSTIP login mary password yram
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test383+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	--json
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ HTTP with --json
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test384+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	--json
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ HTTP with --json from stdin
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test385+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	--json
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ HTTP with --json x 2
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test386+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	--json
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ hello
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ HTTP with --json + --next
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test387+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ gzip
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes" crlf="headers">
@@ -18,7 +18,6 @@ Transfer-Encoding: gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,g
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -sS --tr-encoding
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test388+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -42,7 +43,6 @@ Content-Length: 23
	This IS the real page!
	</data1001>

-	#
	# This is the second request, and this sends back a response saying that
	# the request contained stale data. We want an update. Set swsbounce to
	# bounce on to data1003 on the second request.

tests/data/test389+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ local-http
	# Ensure that we are running on localhost
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test39+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test390+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ parallel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Content-Type: text/html

	</reply>

-	#
	# Client-side
	<client>
	<file name="%LOGDIR/test%TESTNUMBER.txt">
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER file://localhost%FILE_PWD/%LOGDIR/test%TEST
	</command>
	</client>

-	#
	<verify>
	</verify>
	</testcase>

tests/data/test391+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ Content-Type: text/html
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/../../%TESTNUMBER --path-as-is -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test392+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test393+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2000000
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test394+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test395+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test396+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	compressed
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -37,7 +37,6 @@ Content-Length: 1309%CR

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -54,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test397+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	compressed
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	# Length of not-encoded content is 16512 what is greater than default value of
@@ -38,7 +38,6 @@ Content-Length: 47

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -55,7 +54,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test398+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>

@@ -29,7 +29,6 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test399+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ URL
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>

tests/data/test4+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP added headers
	HTTP replaced headers
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test40+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test400+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PASV
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -42,7 +41,6 @@ FTPS dir list PASV unencrypted data
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test4000+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ ECH GREASE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -18,7 +18,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -37,7 +36,6 @@ HTTPS GET with ECH GREASE
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test4001+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ ECH try real and fail
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -28,7 +27,6 @@ Make real ECH attempt and fail with "ech required" error (101)
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test401+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test402+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test403+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ CCC
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -27,7 +27,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ FTPS with CCC not supported by server
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test404+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test405+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test406+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PORT
	LIST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -25,7 +25,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -42,7 +41,6 @@ FTPS dir list, PORT with specified IP
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# Strip all valid kinds of PORT and EPRT that curl can send

tests/data/test407+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test408+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test409+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test41+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test410+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ Long: %repeat[3500 x header content]%
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test411+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stderr mode="text">

tests/data/test412+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ trailing-dot
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -23,7 +23,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -49,7 +48,6 @@ h1 whohoo 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test413+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ trailing-dot
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -23,7 +23,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -49,7 +48,6 @@ h1 whohoo. 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test414+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -44,7 +44,6 @@ Content-Length: 6
	</data3>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -59,7 +58,6 @@ https://attack.invalid:%HTTPSPORT/a/b/%TESTNUMBER --insecure -c %LOGDIR/cookie%T
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test415+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test416+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test417+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test418+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ gzip
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -26,7 +26,6 @@ Transfer-Encoding: gzip
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -sS --tr-encoding
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test419+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -25,7 +24,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D loggg/save-here/fails
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test42+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test420+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -27,7 +27,6 @@ Set-Cookie: mycookie1=; Path=/; Max-Age=-1; Expires=Thu, 01 Jan 1970 00:00:00 GM
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ cookies
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test421+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ header_json
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -36,7 +36,6 @@ feature-policy: accelerometer 'none'; camera 'none'; geolocation 'none'; gyrosco
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -50,7 +49,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{stderr}%{header_json}\n' -s
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test422+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ cmdline
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -22,7 +21,6 @@ use --next with missing URL before it
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stderr mode="text">

tests/data/test423+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test424+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -38,7 +38,6 @@ Funny-head: yesyes
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -60,7 +59,6 @@ http
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test425+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP PUT
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -20,7 +20,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ content
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test426+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ error detection
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -25,7 +24,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -d foobar -C 3
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test427+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -38,7 +38,6 @@ Content-Type: text/html

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -56,7 +55,6 @@ cookies
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test428+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -52,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test429+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test43+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test430+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Derived from on https://github.com/curl/curl/issues/5120
	<info>
@@ -8,7 +9,6 @@ POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1>
@@ -34,7 +34,6 @@ Content-Type: text/3
	</data3>
	</reply>

-	#
	# Client-side
	<client>
	<file1 name="%LOGDIR/config%TESTNUMBER-a">
@@ -67,7 +66,6 @@ Three -K uses with --next and --data in each
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test431+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Derived from on https://github.com/curl/curl/issues/5120
	<info>
@@ -8,7 +9,6 @@ POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1>
@@ -34,7 +34,6 @@ Content-Type: text/3
	</data3>
	</reply>

-	#
	# Client-side
	<client>
	<file1 name="%LOGDIR/config%TESTNUMBER-a">
@@ -61,7 +60,6 @@ Two -K uses with --next and then one on cmdline
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test432+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Derived from on https://github.com/curl/curl/issues/5120
	<info>
@@ -8,7 +9,6 @@ POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1>
@@ -34,7 +34,6 @@ Content-Type: text/3
	</data3>
	</reply>

-	#
	# Client-side
	<client>
	<file1 name="%LOGDIR/config%TESTNUMBER">
@@ -66,7 +65,6 @@ Use -K with --next and --config from within
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test433+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -17,7 +17,6 @@ Content-Type: text/1
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<file1 name="%LOGDIR/curlrc">
@@ -45,7 +44,6 @@ COLUMNS=300
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test434+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	<reply>
	<data>
	HTTP/1.1 200 OK
@@ -17,7 +17,6 @@ Content-Type: text/1
	</data>
	</reply>

-	#
	<client>
	<file name="%LOGDIR/config%TESTNUMBER" nonewline="yes">
	url = %HOSTIP:%HTTPPORT/%TESTNUMBER
@@ -33,7 +32,6 @@ http
	</command>
	</client>

-	#
	<verify>
	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1

tests/data/test435+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -16,7 +16,6 @@ Content-Length: 0
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'lo
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test436+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -17,7 +17,6 @@ Content-Type: text/1
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<file1 name="%LOGDIR/.config/curlrc">
@@ -41,7 +40,6 @@ Find .curlrc in .config/curlrc via CURL_HOME
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test437+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Alt-Svc
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -22,7 +22,6 @@ Alt-Svc: h1="[ffff::1]:8181"
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test438+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP/2
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ Alt-Svc: h1="%HOST6IP:%HTTP6PORT", ma=315360000; persist=0
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -52,7 +51,6 @@ h1 %HOSTIP %HTTPPORT h1 %HOST6IP %HTTP6PORT "20290222 22:19:28" 0 0

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test439+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ aws-sigv4
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ aws-sigv4 with query
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test44+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test440+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test441+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test442+1 -5

@@ -1,12 +1,11 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# perl:
-	#
	# for(1 .. 151) {
	# print join("\t",
	# "attack.invalid", "TRUE", "/", "FALSE", "0",
	# "name$_", "could-be-large-$_")."\n";
	# }
-	#
	<info>
	<keywords>
	HTTP
@@ -15,7 +14,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -28,7 +26,6 @@ Content-Length: 6
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -198,7 +195,6 @@ cookies
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test443+1 -5

@@ -1,12 +1,11 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# perl:
-	#
	#for(1 .. 20) {
	# print join("\t",
	# "attack.invalid", "TRUE", "/", "FALSE", "0",
	# "huge-$_", ('a' x 500)."-$_")."\n";
	#}
-	#
	<info>
	<keywords>
	HTTP
@@ -15,7 +14,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -28,7 +26,6 @@ Content-Length: 6
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -67,7 +64,6 @@ cookies
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test444+1 -6

@@ -1,10 +1,8 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# perl:
-	#
	#for(1 .. 200) {
-	#
	#}
-	#
	<info>
	<keywords>
	HTTP
@@ -13,7 +11,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -106,7 +103,6 @@ Set-Cookie: cookie-80=yes;
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -123,7 +119,6 @@ cookies
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test445+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<connect>
@@ -21,7 +21,6 @@ Connection: close
	</connect>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -50,7 +49,6 @@ Refuse tunneling protocols through HTTP proxy
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# refused in the CONNECT

tests/data/test446+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test447+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ growing file
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -49,7 +48,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test448+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -49,7 +48,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test449+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -49,7 +48,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test45+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test450+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --expand-data
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test451+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --variable sec
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test452+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -24,7 +23,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what=hello --expand-data "--{{wh
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test453+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ variables
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -23,7 +23,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --expand-data
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test454+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -24,7 +23,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what=hello --expand-data "--{{wh
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test455+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ Variable using base64
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test456+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ variables
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -23,7 +23,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --expand-data
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test457+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -36,7 +36,6 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -50,7 +49,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 143
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test458+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test459+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --config %LOGDIR/config --silent
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test46+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test460+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -16,7 +17,6 @@ try --expand without an argument
	</command>
	</client>

-	#
	<verify>
	<errorcode>
	2

tests/data/test461+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -21,7 +21,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H host:
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test462+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -26,7 +25,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test463+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	-d
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -18,7 +18,6 @@ ok!
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ HTTP with -d @file with file containing CR, LF and null byte
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test467+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ cmdline
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>
@@ -18,7 +18,6 @@ use a bad short option letter that does not exist (after one does exist)
	</command>
	</client>

-	#
	# Verify errorcode
	<verify>
	<errorcode>

tests/data/test468+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd%TESTNUMBER -w ""
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test469+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ warn about Unicode quote character
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stderr>

tests/data/test47+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	HTTP/1.0
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -18,7 +18,6 @@ Server: test-server/fake
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -0
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test470+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ warn about Unicode quote character read from config file
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stderr mode="text">

tests/data/test471+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ globbing
	{} list
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -33,7 +33,6 @@ crap data
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -51,7 +50,6 @@ Reject HTTP/1.1 to HTTP/2 switch on the same connection
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test472+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ aws-sigv4
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ aws-sigv4 with query
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test473+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -30,7 +30,6 @@ chunky-trailer: header data%CR
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test474+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -27,7 +27,6 @@ Connection: close
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ https
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test475+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test476+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test477+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -34,7 +34,6 @@ hej
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -48,7 +47,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 5 -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test478+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ netrc
	HTTP
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>

tests/data/test479+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ netrc
	HTTP
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -59,7 +59,6 @@ target
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>

tests/data/test48+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP HEAD
	-G
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ Date: Tue, 09 Nov 2010 14:49:00 GMT
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ HTTP with -d and -G and -I
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test480+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,13 +6,11 @@ netrc
	POP3
	</keywords>
	</info>
-	#
	# Server-side
	<reply>

	</reply>

-	#
	# Client-side
	<client>
	<server>

tests/data/test481+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-clobber -C 1 -o "%LOGDIR/%TESTNUMBER"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test482+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -26,7 +25,6 @@ http://non-existing-host.haxx.se. --remove-on-error -C 1 -o "%LOGDIR/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test483+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/c%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test484+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ etag
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -22,7 +21,6 @@ http://example.com/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --etag-sav
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test485+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ etag
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -22,7 +21,6 @@ http://example.com/%TESTNUMBER http://example.net/fooo --etag-save %LOGDIR/etag%
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test486+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ netrc
	HTTP
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -59,7 +59,6 @@ target
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>

tests/data/test487+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ variables
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ Variable using 64dec with bad base64
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test488+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/b
	</stdin>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test489+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/b
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test49+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test490+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP PUT
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ surprise!
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test491+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP PUT
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ surprise!
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test492+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP PUT
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ second %TESTNUMBER contents
	</file1>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test493+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test494+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ netrc
	macdef
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -15,7 +15,6 @@ blipp
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ machine %HOSTIP login user1 password passwd1
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test495+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ netrc
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://foo%40bar:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --netrc-optional
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test496+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ parallel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -23,7 +22,6 @@ parallel upload missing file
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test497+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test498+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -25,7 +25,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-redirs 400 --location
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# curl: (56) Too large response headers: 6144086 > 6144000

tests/data/test499+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -37,7 +37,6 @@ Funny-head: yesyes
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -51,7 +50,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -I
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test5+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	HTTP proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test50+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test500+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -42,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/ip%TESTNUMBER">

tests/data/test501+1 -2

@@ -1,10 +1,10 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	missing URL
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>
@@ -24,7 +24,6 @@ simple libcurl attempt operation without URL set
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test502+1 -1

@@ -1,10 +1,10 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	FILE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>

tests/data/test503+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test504+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test505+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test506+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test507+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test508+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ POST
	POST callback
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -38,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test509+1 -2

@@ -1,10 +1,10 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
	memory callbacks
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>
@@ -24,7 +24,6 @@ initialization with memory callbacks and actual usage
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test51+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test510+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ chunked Transfer-Encoding
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -39,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test511+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ FTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -32,7 +32,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# CURLE_REMOTE_FILE_NOT_FOUND

tests/data/test512+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test513+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>
@@ -30,7 +30,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 42 - aborted by callback

tests/data/test514+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP HEAD
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -23,7 +23,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test515+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP POST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -36,7 +36,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test516+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FORM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -41,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test517+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ getdate
	unittest
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>
@@ -22,7 +22,6 @@ curl_getdate() testing
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test518+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test519+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -59,7 +59,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test52+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test520+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ FTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -34,7 +34,6 @@ ftp://%HOSTIP:%FTPPORT/520
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>

tests/data/test521+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	CURLOPT_PORT
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -24,7 +24,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test522+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ CURLOPT_PORT
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -23,7 +23,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP/%TESTNUMBER %HTTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test523+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ CURLOPT_PROXY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test524+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ UPLOAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ ftp://%HOSTIP:%FTPPORT/path/to/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test525+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test526+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test527+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test528+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test529+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test53+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test530+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test531+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test532+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test533+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test534+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test535+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -52,7 +53,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test536+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ CURLINFO_USED_PROXY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -26,7 +26,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ CURLINFO_USED_PROXY
	# 0 - the proxy URL
	# 1 - the non-proxy using URL
	# 2 - the CURLOPT_RESOLVE string to change IP for the name
-	#
	<command>
	http://%HOSTIP:%HTTPPORT goingdirect.com:%HTTPPORT goingdirect.com:%HTTPPORT:%HOSTIP
	</command>
@@ -52,7 +50,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test537+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test538+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test539+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ FTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -40,7 +40,6 @@ ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test54+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test540+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test541+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test542+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -40,7 +41,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	</client>

	# Verify data after the test has been "shot"
-	#
	# There is no MTDM in the protocol here since this code does not ask for the
	# time/date of the file
	<verify>

tests/data/test543+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -17,7 +18,6 @@ curl_easy_escape
	</client>

	# Verify data after the test has been "shot"
-	#
	# There is no MTDM in the protocol here since this code does not ask for the
	# time/date of the file
	<verify>

tests/data/test544+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers" nonewline="yes">

tests/data/test545+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -37,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers" nonewline="yes">

tests/data/test546+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test547+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test548+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test549+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test55+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test550+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CURLOPT_PROXY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -24,7 +24,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT ascii
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test551+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	# this test is meant to be exactly like 547 but using Digest instead of NTLM

tests/data/test552+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	# this test is meant to be exactly like 551 but is based on the debug code

tests/data/test553+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test554+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FORM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -58,7 +58,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test555+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# NOTE: this test case is a duplicate of 547 but the tool is built to use the
	# multi interface instead of easy, but that should not be noticeable at all in

tests/data/test556+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -18,7 +19,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +35,6 @@ http://%HOSTIP:%HTTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test557+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ printf
	unittest
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>
@@ -22,7 +22,6 @@ curl_mprintf() testing
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test558+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ TrackMemory
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>
@@ -26,7 +26,6 @@ libtest memory tracking operational
	</name>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/memdump">

tests/data/test559+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -43,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test56+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -27,15 +28,11 @@ http
	HTTP POST with HUGE request and chunked transfer-encoding
	</name>
	<stdin>
-	#
	data "we post this"
-	#
	# enforce chunky post!
	header "Transfer-Encoding: chunked"
-	#
	# Set the user-agent using a short-option:
	-A "%repeat[99999 x a]%"
-	#
	</stdin>
	<command>
	-K - %HOSTIP:%HTTPPORT/that.site.com/%TESTNUMBER

tests/data/test560+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ multi
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test561+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ type=
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ hello
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -47,7 +46,6 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test562+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -35,7 +36,6 @@ FTP a type=A URL and CURLOPT_PORT set
	</client>

	# Verify data after the test has been "shot"
-	#
	# There is no MTDM in the protocol here since this code does not ask for the
	# time/date of the file
	<verify>

tests/data/test563+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test564+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	# Warning: if this test fails to start the SSH server, check that none of
	# the user's shell profiles sends output to stdout of a non-interactive shell.

tests/data/test565+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP Digest auth
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -75,7 +75,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test566+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -41,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/ip%TESTNUMBER">

tests/data/test567+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	#Informational

tests/data/test568+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	#Informational

tests/data/test569+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	#Informational

tests/data/test57+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test570+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	#Informational

tests/data/test571+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	# Informational

tests/data/test572+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	#Informational

tests/data/test573+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ multi
	flaky
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test574+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,9 +10,7 @@ ftplistparser
	</keywords>
	</info>

-	#
	# Server-side
-	#
	# Data is generated by the ftp server itself

	# Client-side

tests/data/test575+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test576+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test577+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	#Informational

tests/data/test578+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP POST
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -42,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/ip%TESTNUMBER">

tests/data/test579+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	HTTP Digest auth
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -73,7 +73,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/ip%TESTNUMBER">

tests/data/test58+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test580+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test581+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test582+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test583+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test584+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP MIME
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -55,7 +55,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test585+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test586+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ PASV
	CURLOPT_PORT
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ last line
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test587+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ flaky
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -38,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# CURLE_ABORTED_BY_CALLBACK (42)

tests/data/test588+1 -2

@@ -1,9 +1,8 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
-	#
	# This test is exactly like 525 but the server rejects the EPRT command.
	# Written up to make sure that there is nothing in the multi interface
	# active connection case that differs between PORT and EPRT use
-	#
	<info>
	<keywords>
	FTP

tests/data/test589+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP MIME
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -41,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test59+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	HTTP GET
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -17,7 +17,6 @@ hej
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ HTTP URL with slash but with "parameter"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test590+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test591+1 -2

@@ -1,9 +1,8 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
-	#
	# For this test the server rejects the EPRT command,
	# code in lib%TESTNUMBER makes use of curl_multi_timeout()
	# and server does not establish data connection.
-	#
	<info>
	<keywords>
	FTP

tests/data/test592+1 -2

@@ -1,9 +1,8 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
-	#
	# For this test the server rejects the EPRT command,
	# code in lib591 makes use of curl_multi_timeout()
	# and server does not establish data connection.
-	#
	<info>
	<keywords>
	FTP

tests/data/test593+1 -2

@@ -1,9 +1,8 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
-	#
	# For this test the server rejects the EPRT command,
	# code in lib591 makes use of curl_multi_timeout()
	# and server does not establish data connection.
-	#
	<info>
	<keywords>
	FTP

tests/data/test594+1 -2

@@ -1,9 +1,8 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
-	#
	# For this test the server rejects the EPRT command,
	# code in lib591 makes use of curl_multi_timeout()
	# and server does not establish data connection.
-	#
	<info>
	<keywords>
	FTP

tests/data/test595+1 -4

@@ -1,13 +1,11 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
-	#
	# This test is like 585 but uses passive FTP instead of HTTP
-	#
	<info>
	<keywords>
	FTP
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -40,7 +38,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test596+1 -4

@@ -1,13 +1,11 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
-	#
	# This test is like 585 but uses active FTP instead of HTTP
-	#
	<info>
	<keywords>
	FTP
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -40,7 +38,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER activeftp
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test597+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -24,7 +25,6 @@ ftp://%HOSTIP:%FTPPORT

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test598+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ CURLOPT_REFERER
	curl_easy_reset
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -63,7 +63,6 @@ cookies
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test599+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -76,7 +76,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/ip%TESTNUMBER">

tests/data/test6+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test60+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test600+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SFTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ for ssh test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test601+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SCP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ for ssh test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test602+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ SFTP put
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ for ssh upload test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<upload>

tests/data/test603+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ SCP upload
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ for ssh upload test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<upload>

tests/data/test604+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -20,7 +20,6 @@ SFTP retrieval of nonexistent file
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test605+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -20,7 +20,6 @@ SCP retrieval of nonexistent file
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test606+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -20,7 +20,6 @@ SFTP invalid user login
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test607+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -20,7 +20,6 @@ SCP invalid user login
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test608+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ post-quote
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ Test file for rename test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ Test file for rename test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/file%TESTNUMBER.txt">

tests/data/test609+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -15,7 +15,6 @@ Test file for mkdir test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ Test file for mkdir test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test61+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test610+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ post-quote
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ Dummy test file for rmdir test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ Dummy test file for rmdir test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test611+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ post-quote
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ Dummy test file for rename test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ Dummy test file for rename test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test612+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ post-quote
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -14,7 +14,6 @@ Dummy test file for remove test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ Dummy test file for remove test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test613+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ directory
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<datacheck>
@@ -17,7 +17,6 @@ d????????? N U U N ??? N NN:NN asubdir
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ SFTP directory retrieval
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test614+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ directory
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<datacheck>
@@ -18,7 +18,6 @@ d????????? N U U N ??? N NN:NN asubdir
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ SFTP pre-quote chmod
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test615+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +28,6 @@ for ssh upload test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test616+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ zero-length
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data sendzero="yes">
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ SFTP retrieval of empty file
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test617+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ zero-length
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data sendzero="yes">
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ SCP retrieval of empty file
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test618+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SFTP
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -25,7 +25,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test619+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SCP
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -25,7 +25,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test62+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test620+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -24,7 +24,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test621+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -24,7 +24,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout>

tests/data/test622+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ for ssh upload test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test623+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ for ssh upload test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test624+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ SFTP put
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ for ssh upload test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<upload>

tests/data/test625+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ SFTP put
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ for ssh upload test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<upload>

tests/data/test626+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ Test file for rename test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test627+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,14 +8,12 @@ NOBODY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data sendzero="yes">
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ Dummy test file for remove test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test628+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -20,7 +20,6 @@ SFTP invalid user login (password authentication)
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test629+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -20,7 +20,6 @@ SCP invalid user login (password authentication)
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test63+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test630+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ server key check
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -21,7 +21,6 @@ SFTP incorrect host key
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test631+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ server key check
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -21,7 +21,6 @@ SCP incorrect host key
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test632+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ server key check
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<features>
@@ -21,7 +21,6 @@ SFTP syntactically invalid host key
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test633+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Range
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ data
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test634+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Range
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -15,7 +15,6 @@ for ssh test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test635+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Range
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ ssh test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test636+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ Range
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -15,7 +15,6 @@ for ssh test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test637+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ Range
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test638+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ asterisk
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -16,7 +16,6 @@ Dummy test file for rename test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ Dummy test file for rename test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test639+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ asterisk
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -16,7 +16,6 @@ Dummy test file for rename test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ Dummy test file for rename test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<postcheck>

tests/data/test64+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test640+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ NOBODY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test641+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ NOBODY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test642+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SFTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ for ssh test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ for ssh test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test643+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP MIME POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -58,7 +58,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test644+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ xattr
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -40,7 +40,6 @@ Funny-head: yesyes
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -62,7 +61,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -L -o %LOGDIR/out%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test645+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP MIME POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -58,7 +58,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test646+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ MULTIPART
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -57,7 +56,6 @@ X-fileheader2: This is #a
	</file2>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test647+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ MULTIPART
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -46,7 +45,6 @@ It may contain any type of data.
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test648+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ MULTIPART
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ It may contain any type of data and will be encoded in base64 for transfer.
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test649+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ MULTIPART
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -39,7 +38,6 @@ It contains at least an 8-bit byte value.
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test65+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test650+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FORM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -59,7 +59,6 @@ This is data from a file.
	</file>
	</client>

-	#
	# Verify data bbter the test has been "shot"
	<verify>
	<strippart>

tests/data/test651+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FORM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -48,7 +48,6 @@ This is data from a file.
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test652+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ MIME
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -32,7 +31,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test653+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ MIME
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -58,7 +58,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test654+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP MIME POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -61,7 +61,6 @@ This is data from a file
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test655+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -40,7 +40,6 @@ http://failthis/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test656+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<server>
@@ -20,7 +20,6 @@ SFTP retrieval with nonexistent private key file
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test658+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test659+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test66+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -26,7 +27,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test660+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -24,7 +25,6 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test661+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ FTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -30,7 +30,6 @@ ftp://%HOSTIP:%FTPPORT/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test662+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP proxy
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -40,7 +40,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -57,7 +56,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test663+1 -5

@@ -1,8 +1,7 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
-	#
	# This test is crafted to reproduce oss-fuzz bug
	# https://crbug.com/oss-fuzz/17954
-	#
	<info>
	<keywords>
	HTTP
@@ -11,7 +10,6 @@ HTTP proxy
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -44,7 +42,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -61,7 +58,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test664+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ server key check
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test665+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ server key check
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -14,7 +14,6 @@ test
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ test
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test666+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ MIME
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -29,7 +29,6 @@ OK
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -50,7 +49,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test667+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP MIME POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test668+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP MIME POST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -54,7 +54,6 @@ This is data from a file
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test669+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test67+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test670+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ MIME
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test671+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ MIME
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test672+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FORM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test673+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FORM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -51,7 +51,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<strippart>

tests/data/test674+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test675+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test676+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ CURLOPT_REFERER
	curl_easy_reset
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -66,7 +66,6 @@ cookies
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test677+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,14 +7,12 @@ CONNECT_ONLY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ imap://%HOSTIP:%IMAPPORT/677

	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test678+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ PEM certificate
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ MooMoo
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ https://localhost:%HTTPSPORT/%TESTNUMBER %CERTDIR/certs/test-ca.crt
	</precheck>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test679+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a"
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test68+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test680+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ HTTP
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -27,7 +26,6 @@ machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test681+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -20,7 +20,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ http
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test682+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ machine %HOSTIP login user2 password passwd2
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test683+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ machine %HOSTIP login user2 password passwd2
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test684+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ machine %HOSTIP password 5up3r53cr37
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test685+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ HTTP
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -20,7 +20,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ machine %HOSTIP password 5up3r53cr37
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test686+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ errorcode
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<name>
@@ -21,7 +20,6 @@ htdhdhdtp://localhost --next
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test687+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ xattr
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -22,7 +22,6 @@ Content-Type: fake/data
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -o %LOGDIR/out%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test688+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ xattr
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -22,7 +22,6 @@ Content-Type: fake/data
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ basic --xattr with -O
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test689+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>

	#Informational

tests/data/test69+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test690+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/ -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test691+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/path/to/here/ -O --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test692+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/ -JO --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test693+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	etag
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -30,7 +30,6 @@ chunky-trailer: header data
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/moo/boo/etag%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test694+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test695+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test696+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -18,7 +19,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +35,6 @@ http://%HOSTIP:%HTTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout crlf="headers">

tests/data/test697+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ HTTP
	netrc
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -24,7 +23,6 @@ netrc with missing netrc file
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test698+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test699+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test7+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test70+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test700+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SOCKS4
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ HTTP GET via SOCKS4 proxy
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test701+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SOCKS5
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ HTTP GET via SOCKS5 proxy
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test702+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off 19
	<info>

tests/data/test703+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off 19
	<info>

tests/data/test704+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off 19
	<info>

tests/data/test705+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off 19
	<info>

tests/data/test706+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off test 100
	<info>
@@ -8,7 +9,6 @@ LIST
	SOCKS4
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -26,7 +26,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ FTP dir list PASV via SOCKS4
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test707+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off test 100
	<info>
@@ -8,7 +9,6 @@ LIST
	SOCKS5
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data mode="text">
@@ -26,7 +26,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ FTP dir list PASV via SOCKS5
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test708+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SOCKS4
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test709+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ http_proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -48,7 +47,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test71+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test710+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SOCKS5
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test711+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off test 707 after bug report #1218
	<info>
@@ -9,7 +10,6 @@ SOCKS5
	all_proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ silly content
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test712+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off test 707 after bug report #1218
	<info>
@@ -8,7 +9,6 @@ RETR
	SOCKS5
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -16,7 +16,6 @@ silly content
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -34,7 +33,6 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test713+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off test 712
	<info>
@@ -9,7 +10,6 @@ SOCKS5
	CURLOPT_CONNECT_TO
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -17,7 +17,6 @@ silly content
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -35,7 +34,6 @@ ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test714+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off test 712
	<info>
@@ -11,7 +12,6 @@ proxytunnel
	CURLOPT_CONNECT_TO
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<connect>
@@ -32,7 +32,6 @@ silly content
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -54,7 +53,6 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test715+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	#based off test 712
	<info>
@@ -12,7 +13,6 @@ SOCKS5
	CURLOPT_CONNECT_TO
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<connect>
@@ -33,7 +33,6 @@ silly content
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -56,7 +55,6 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test716+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ SOCKS5
	all_proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	# method 2 is SOCKS5 asking for user+password
@@ -15,7 +15,6 @@ method 2
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://hohoho.example.com:99/%TESTNUMBER -x socks5://%repeat[256 x A]%:b@%HOSTIP
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test717+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ SOCKS5
	all_proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -32,7 +32,6 @@ backendport %HTTPPORT
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -52,7 +51,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test718+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test719+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ SOCKS5h
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -46,7 +45,6 @@ http://[2200::33]:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test72+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test720+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ SOCKS5h
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ http://12.34.56.78:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test721+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ SOCKS5h
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -27,7 +27,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -45,7 +44,6 @@ http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCK
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test722+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ IPFS
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test723+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -27,7 +26,6 @@ IPFS with malformed gateway URL (bad function argument error)
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# malformed gateway URL (bad function argument error)

tests/data/test724+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test725+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -33,7 +32,6 @@ http://nonexisting,local:8080
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test726+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -20,7 +19,6 @@ ipfs
	http
	</server>
	<setenv>
-	#
	# Set a home that does not have a ".ipfs" folder. %PWD should be good.
	# This is to prevent the automatic gateway detection from finding a gateway file in your home folder.
	HOME=%PWD
@@ -33,7 +31,6 @@ ipfs://bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u
	</command>
	</client>

-	#
	# Verify with no gateway URL and no auto detection
	<verify>
	<errorcode>

tests/data/test727+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPNS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPNS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ IPNS
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test728+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ followlocation
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	# The hostname in this redirect is 256 characters and too long (> 255) for
@@ -23,7 +23,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ SOCKS5h with HTTP redirect to hostname too long
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test729+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ SOCKS4
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -30,7 +29,6 @@ http://fake --limit-rate 1 -x socks4a://%repeat[1015 x a]%@%HOSTIP:%SOCKSPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# CURLE_PROXY

tests/data/test73+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test730+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ IPFS arg gateway with path
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test731+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test732+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ IPFS with path
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test733+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ IPFS with path and query args
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test734+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ IPFS with path, query args and gateway with path
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test735+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ IPNS with path, query args and gateway with path
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test736+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test737+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -47,7 +46,6 @@ http://%HOSTIP:%HTTPPORT
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test738+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -30,7 +29,6 @@ ipfs://bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u
	</command>
	</client>

-	#
	# Verify error code with no gateway file (detection fails)
	<verify>
	<errorcode>

tests/data/test739+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -27,7 +26,6 @@ IPNS path and query args for gateway and IPFS URL (malformed gateway URL)
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test74+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ globbing
	{} list
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -33,7 +33,6 @@ crap data
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -47,7 +46,6 @@ HTTP, urlglob {}-retrieval and -o #[num] usage
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test740+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Hello curl from IPFS
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -49,7 +48,6 @@ bar
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test741+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ IPFS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -34,7 +33,6 @@ bar
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# malformed gateway URL, first line in file must be a gateway URL

tests/data/test742+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ SOCKS5
	all_proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -32,7 +32,6 @@ backendport %HTTPPORT
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -52,7 +51,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test743+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/config
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test744+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ netrc
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -38,7 +38,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -59,7 +58,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test745+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ symbols-in-versions
	</keywords>
	</info>

-	#
	# Client-side
	<client>

tests/data/test746+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ cmdline
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test747+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -24,7 +24,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test748+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>

tests/data/test749+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test75+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ globbing
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -26,7 +25,6 @@ HTTP, urlglob retrieval with bad range
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test750+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test751+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test752+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -41,7 +41,6 @@ Funny-head: yesyes
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -55,7 +54,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -f --retry 1
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test753+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test754+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test755+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ netrc
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -21,7 +21,6 @@ contents
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test756+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test757+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test758+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test759+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ globbing
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>
@@ -16,7 +16,6 @@ glob '{,'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# curl: (3) unmatched brace in URL position 1:

tests/data/test76+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test760+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ globbing
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>
@@ -16,7 +16,6 @@ more cmdline options than URLs and --next
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# curl: (1) Protocol "qttp" not supported

tests/data/test761+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ globbing
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>
@@ -16,7 +16,6 @@ http://testingthis/%repeat[201 x {a}b]%
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test762+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	<reply>
	<data nocheck="yes">
	HTTP/1.1 200 OK
@@ -21,7 +21,6 @@ Connection: close
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time --output-dir %LOGDIR
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test763+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test764+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -40,7 +40,6 @@ Funny-head: yesyes

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -57,7 +56,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -w '%header{this:all:***}\n' -o %LOGDIR/
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout mode="text">

tests/data/test765+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -40,7 +40,6 @@ Funny-head: yesyes

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -57,7 +56,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -w '%header{this:all:-{\}-}\n' -o %LOGDI
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stdout mode="text">

tests/data/test766+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test767+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test768+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test769+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test77+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ If-Modified-Since
	-z
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -25,7 +25,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test770+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test771+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test772+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Location
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -21,7 +21,6 @@ Location: that
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test773+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ Location
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -21,7 +21,6 @@ Location: this
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test774+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test775+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test776+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test777+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -17,7 +17,6 @@ Content-Type: text/html
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ bad base64:also!bad
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	</verify>

tests/data/test778+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ followlocation
	oauth2-bearer
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -56,7 +56,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -73,7 +72,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test779+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ oauth2-bearer
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<servercmd>
@@ -41,7 +41,6 @@ Connection: close
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -56,7 +55,6 @@ http://%HOSTIP:%HTTPPORT/page/%TESTNUMBER --oauth2-bearer s3cr3t --location --pr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test78+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ If-Modified-Since
	-z
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -37,7 +37,6 @@ Funny-head: yesyes
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -51,7 +50,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test780+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test781+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test782+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test783+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test784+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ On the first Monday of the month of April, 1625, the market town of Meung
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test785+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ On the first Monday of the month of April, 1625, the market town of Meung
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test786+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ On the first Monday of the month of April, 1625, the market town of Meung
	</stdin>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers" nonewline="yes">

tests/data/test787+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -25,7 +24,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable "name[15-14]@%LOGDIR/fooo" --exp
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test788+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ On the first Monday of the month of April, 1625, the market town of Meung
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test789+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ On the first Monday of the month of April, 1625, the market town of Meung
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test79+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	HTTP proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -21,7 +21,6 @@ contents
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test790+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable "name[5-9]=0123456789abcdef" --e
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test791+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable "name[10-30]=0123456789abcdef" -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes" nonewline="yes">

tests/data/test792+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ netrc
	FTP
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -13,7 +13,6 @@ content
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>

tests/data/test793+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ netrc
	FTP
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -13,7 +13,6 @@ content
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>

tests/data/test794+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@
	--location
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test795+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ IMAP
	followlocation
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<servercmd>
@@ -40,7 +40,6 @@ Connection: close
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -55,7 +54,6 @@ http://@%HOSTIP:%HTTPPORT/page/%TESTNUMBER -u user:secret --location --proto-red
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test796+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@
	--location
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test797+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@
	--location
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">

tests/data/test799+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SASL AUTH +LOGIN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -25,7 +25,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ IMAP with --login-options 'AUTH=+LOGIN'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test8+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test80+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ proxytunnel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -42,7 +42,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -60,7 +59,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test800+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -21,7 +21,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ IMAP FETCH message
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test801+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -18,7 +18,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ IMAP FETCH message by MAILINDEX and SECTION
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test802+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ UIDVALIDITY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -19,7 +19,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ IMAP SELECT UIDVALIDITY Success
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test803+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,12 +10,10 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +27,6 @@ IMAP SELECT UIDVALIDITY Failure
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# CURLE_REMOTE_FILE_NOT_FOUND - UIDVALIDITY mismatch

tests/data/test804+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SELECT
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -18,7 +18,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ IMAP does not perform SELECT if reusing the same mailbox
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test805+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ UPLOAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test806+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -17,7 +17,6 @@ LIST
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test807+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -18,7 +18,6 @@ CUSTOMREQUEST
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "%TESTNUMBER" *'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test808+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -22,7 +22,6 @@ CUSTOMREQUEST
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE %TESTNUMBER'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test809+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -16,7 +16,6 @@ CUSTOMREQUEST
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS %TESTNUMBER (UIDNEXT MESSAGES
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test81+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test810+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SEARCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -15,7 +15,6 @@ SEARCH
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER?NEW -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test811+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE %TESTNUMBER'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test812+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE %TESTNUMBER'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test813+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 %TESTNUMBER'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test814+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret -X 'CHECK'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test815+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1 crlf="yes">
@@ -17,7 +17,6 @@ CUSTOMREQUEST
	</data1>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test816+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data1 crlf="yes">
@@ -20,7 +20,6 @@ CUSTOMREQUEST
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test817+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 %TESTNUMBER'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test818+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -19,7 +19,6 @@ CUSTOMREQUEST
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ imap://%HOSTIP:%IMAPPORT -X NOOP -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test819+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ RFC4616
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -27,7 +27,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ IMAP plain authentication
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test82+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test820+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ SASL AUTH LOGIN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -27,7 +27,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ IMAP login authentication
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test821+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ RFC2195
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -27,7 +27,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ IMAP CRAM-MD5 authentication
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test822+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ NTLM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -47,7 +46,6 @@ IMAP NTLM authentication
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test823+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ RFC2831
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -51,7 +50,6 @@ IMAP DIGEST-MD5 authentication
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test824+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ RFC6749
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -27,7 +27,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ IMAP OAuth 2.0 (XOAUTH2) authentication
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test825+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4616
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ IMAP plain authentication with initial response
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test826+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ SASL-IR
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ IMAP login authentication with initial response
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test827+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ NTLM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -48,7 +47,6 @@ IMAP NTLM authentication with initial response
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test828+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC6749
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ IMAP OAuth 2.0 (XOAUTH2) authentication with initial response
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test829+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -19,7 +20,6 @@ imap://%HOSTIP:%IMAPPORT/%0d%0a/%TESTNUMBER
	</command>
	</client>

-	#
	<verify>
	# 3 - CURLE_URL_MALFORMAT
	<errorcode>

tests/data/test83+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP Basic auth
	proxytunnel
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -57,7 +56,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test830+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC2195
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY * A002 NO AUTH exchange cancelled by client
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,14 +37,12 @@ IMAP CRAM-MD5 graceful cancellation
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
	<protocol crlf="yes">

tests/data/test831+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ SASL CANCELLATION
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY * A002 NO AUTH exchange cancelled by client
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,14 +38,12 @@ IMAP NTLM graceful cancellation
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
	<protocol crlf="yes">

tests/data/test832+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC2831
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY * A002 NO AUTH exchange cancelled by client
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,14 +39,12 @@ IMAP DIGEST-MD5 graceful cancellation
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
	<protocol crlf="yes">

tests/data/test833+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC2195
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -31,7 +31,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -49,7 +48,6 @@ IMAP CRAM-MD5 authentication with SASL downgrade
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test834+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ SASL DOWNGRADE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -31,7 +31,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -50,7 +49,6 @@ IMAP NTLM authentication with SASL downgrade
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test835+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC2831
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -31,7 +31,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -51,7 +50,6 @@ IMAP DIGEST-MD5 authentication with SASL downgrade
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test836+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ connection reuse
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -26,7 +26,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ IMAP multiple connection authentication
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test837+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ RFC4422
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -27,7 +27,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ IMAP external authentication
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test838+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ RFC4422
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -27,7 +27,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ IMAP external authentication without credentials
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test839+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4422
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ IMAP external authentication with initial response
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test84+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP Basic auth
	HTTP proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -21,7 +21,6 @@ contents
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test840+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4422
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ IMAP external authentication with initial response without credentials
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test841+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -28,7 +28,6 @@ body
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ IMAP custom request does not check continuation data
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test842+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -28,7 +28,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication
	# base64 encoded message so we must assert this
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test843+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test844+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,14 +32,12 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
	<protocol crlf="yes">

tests/data/test845+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -21,7 +21,6 @@ REPLY AQ== A002 NO Authentication failed
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,14 +34,12 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
	<protocol crlf="yes">

tests/data/test846+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ IMAP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -23,7 +23,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ IMAP PREAUTH response
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test847+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -21,7 +21,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ IMAP FETCH message
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test848+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ RFC4616
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -27,7 +27,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ IMAP plain authentication with alternative authorization identity
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test849+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ RFC4616
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -18,7 +18,6 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= A002 NO Not authorized
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,14 +31,12 @@ IMAP plain auth with alt authorization identity (Not authorized)
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
	<protocol crlf="yes">

tests/data/test85+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ HTTP proxy Basic auth
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -24,7 +24,6 @@ contents
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test850+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ RETR
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -21,7 +21,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test851+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -16,7 +16,6 @@ REPLY LIST +OK %TESTNUMBER 100\r\n.
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test852+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -16,7 +16,6 @@ REPLY LIST -ERR no such message
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test853+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ SLOWDOWN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	# We use SLOWDOWN to really exercise the end-of-body parsing over multiple
@@ -25,7 +25,6 @@ SLOWDOWN
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ pop3://%HOSTIP:%POP3PORT/ -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test854+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ LIST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -17,7 +17,6 @@ REPLY LIST +OK but no messages\r\n.
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ pop3://%HOSTIP:%POP3PORT/ -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test855+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -16,7 +16,6 @@ REPLY RETR -ERR no such message
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test856+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FAILURE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -15,7 +15,6 @@ REPLY PASS -ERR Login failure
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,14 +28,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:wrong
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test857+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ RETR
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -32,7 +32,6 @@ To: fake@nowhere
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test858+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret -X DELE -I
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test859+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X STAT -I
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test86+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ globbing
	[] range
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -47,7 +47,6 @@ crap data
	</data3>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -61,7 +60,6 @@ HTTP, urlglob []-retrieval and -o #[num] usage
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test860+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X NOOP -I
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test861+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC2449
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -24,7 +24,6 @@ CAPA UIDL USER
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X UIDL
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test862+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC2449
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -22,7 +22,6 @@ To: fake@nowhere
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP %TESTNUMBER 0'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test863+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X RSET -I
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test864+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ APOP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -24,7 +24,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test865+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test866+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test867+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -47,7 +46,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test868+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ NTLM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -30,7 +30,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -49,7 +48,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test869+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -30,7 +30,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test87+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ globbing
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data1 crlf="headers">
@@ -27,7 +27,6 @@ two is nice too
	</data2>

	</reply>
-	#
	# Client-side
	<client>
	<server>
@@ -44,10 +43,8 @@ urlglob with out of range -o #[num] usage
	</command>
	</client>

-	#
	# Verify data after the test has been "shot". Note that the command line
	# writes both responses into the same filename so only the second survives
-	#
	<verify>
	<file name="%LOGDIR/dumpit%TESTNUMBER-#2.dump" crlf="headers">
	HTTP/1.1 200 OK

tests/data/test870+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC6749
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test871+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test872+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test873+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ NTLM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -30,7 +30,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -49,7 +48,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass --sasl-ir
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test874+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC6749
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test875+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -19,7 +20,6 @@ pop3://%HOSTIP:%POP3PORT/%0d%0a/%TESTNUMBER
	</command>
	</client>

-	#
	<verify>
	# 3 - CURLE_URL_MALFORMAT
	<errorcode>

tests/data/test876+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -21,7 +21,6 @@ REPLY * -ERR AUTH exchange cancelled by client
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,14 +38,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test877+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -21,7 +21,6 @@ REPLY * -ERR AUTH exchange cancelled by client
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,14 +39,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test878+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -21,7 +21,6 @@ REPLY * -ERR AUTH exchange cancelled by client
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,14 +40,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test879+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -12,7 +13,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -33,7 +33,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -51,7 +50,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test88+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test880+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -33,7 +33,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -52,7 +51,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test881+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -12,7 +13,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -33,7 +33,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -53,7 +52,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test882+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ connection reuse
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -25,7 +25,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER001 -u user.one:secret -: pop3://%HOSTIP:%PO
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test883+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ POP3 external authentication
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test884+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ POP3 external authentication without credentials
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test885+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ POP3 external authentication with initial response
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test886+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ POP3 external authentication with initial response without credentials
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test887+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -30,7 +30,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test888+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -12,7 +13,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -30,7 +30,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test889+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -22,7 +22,6 @@ REPLY AQ== -ERR Authentication failed
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,14 +35,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test89+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test890+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -12,7 +13,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -22,7 +22,6 @@ REPLY AQ== -ERR Authentication failed
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,14 +35,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test891+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ POP3
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -14,7 +14,6 @@ REPLYLF AUTH +
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test892+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -29,7 +29,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-authzid shared-mailbo
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test893+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC5034
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= -ERR Not authorized
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,14 +33,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u kurt:xipj3plmq --sasl-authzid ursel
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test894+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ RETR
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -26,7 +25,6 @@ pop3://user%0dFRIGGING_cmd:secret@%HOSTIP:%POP3PORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# malformed URL

tests/data/test895+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -22,7 +22,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ IMAP with --login-options 'AUTH=*'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test896+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,12 +9,10 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ IMAP with --login-options 'AUTH=dummy' (failing)
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 3 == CURLE_URL_MALFORMAT

tests/data/test897+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -21,7 +21,6 @@ POSTFETCH extra stuff sent in the envelope after the body
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ IMAP and envelope meta data after body transfer
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test898+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -54,7 +54,6 @@ hey

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -71,7 +70,6 @@ HTTP with custom auth and cookies redirected to HTTP on a diff port
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test899+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP Basic auth
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -29,7 +29,6 @@ final
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://first:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER -L
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test9+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test90+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test900+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test901+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test902+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ RFC821
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -15,7 +15,6 @@ REPLY EHLO 500 Command unrecognized
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -35,7 +34,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test903+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY AHVzZXIAc2VjcmV0 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test904+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY c2VjcmV0 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test905+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg== 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test906+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ NTLM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAA
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test907+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test908+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC6749
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test909+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test91+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test910+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test911+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test912+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ SIZE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -14,7 +14,6 @@ CAPA SIZE
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test913+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ SIZE
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -14,7 +14,6 @@ CAPA "SIZE 32"
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test914+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -13,7 +13,6 @@ REPLY MAIL 501 not fine enough
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test915+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] -T -
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test916+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -30,7 +29,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from sender@exam
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test917+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test918+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test919+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY AUTH 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test92+1 -0

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>

tests/data/test920+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY c2VjcmV0 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test921+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ NTLM
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAA
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test922+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC6749
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY AUTH 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test923+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ VRFY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -25,7 +24,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test924+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ VRFY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -17,7 +17,6 @@ VRFY
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt smith
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test925+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ VRFY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -14,7 +14,6 @@ VRFY
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +27,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected]
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test926+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ VRFY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -14,7 +14,6 @@ REPLY VRFY 550 Unknown user
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +27,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 8 - CURLE_WEIRD_SERVER_REPLY

tests/data/test927+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -17,7 +17,6 @@ CUSTOMREQUEST
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test928+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HELP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -15,7 +15,6 @@ HELP
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -29,7 +28,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test929+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -26,7 +25,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X NOOP -I
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test93+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	HTTP proxy
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -19,7 +19,6 @@ bing
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test930+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ CUSTOMREQUEST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -26,7 +25,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X RSET -I
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test931+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -19,7 +20,6 @@ smtp://%HOSTIP:%SMTPPORT/%0d%0a/%TESTNUMBER
	</command>
	</client>

-	#
	<verify>
	# 3 - CURLE_URL_MALFORMAT
	<errorcode>

tests/data/test932+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY * 501 AUTH exchange cancelled by client
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,14 +37,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test933+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY * 501 AUTH exchange cancelled by client
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,14 +38,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test934+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY * 501 AUTH exchange cancelled by client
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,14 +39,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test935+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -23,7 +23,6 @@ REPLY AHVzZXIAc2VjcmV0 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -44,7 +43,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test936+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -23,7 +23,6 @@ REPLY AHVzZXIAc2VjcmV0 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -45,7 +44,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test937+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -23,7 +23,6 @@ REPLY AHVzZXIAc2VjcmV0 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -46,7 +45,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test938+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -21,7 +21,6 @@ REPLY dXNlci50d28AdXNlci50d28Ac2VjcmV0 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER002 --mail-rcpt [email protected] --mail
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test939+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ RFC821
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -14,7 +14,6 @@ REPLY EHLO 500 Command unrecognized
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test94+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ HTTP proxy
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<connect nocheck="yes">
@@ -21,7 +21,6 @@ bing
	</connect>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ https://test.anything.really.com:%TESTNUMBER --proxy1.0 %HOSTIP:%HTTPPORT
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<errorcode>

tests/data/test940+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test941+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test942+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY dXNlcg== 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ mail body
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test943+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY = 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ mail body
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test944+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY AUTH 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ mail body
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test945+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY AUTH 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ mail body
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test946+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test947+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -20,7 +20,6 @@ REPLY AUTH 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test948+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -10,7 +11,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -38,14 +38,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test949+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -11,7 +12,6 @@ RFC7628
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -21,7 +21,6 @@ REPLY AQ== 535 Username and Password not accepted. Learn more at\r\n535 http://s
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,14 +37,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test95+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ proxytunnel
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -39,7 +39,6 @@ contents
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -57,7 +56,6 @@ proxy
	</features>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<proxy crlf="headers">

tests/data/test950+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ VRFY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -15,7 +15,6 @@ VRFY
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient --request "vrfy"
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test951+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test952+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -27,7 +26,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test953+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test954+1 -4

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC4954
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 501 Not authorized
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,14 +35,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 67 - CURLE_LOGIN_DENIED
	<errorcode>
	67
	</errorcode>
-	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
	<protocol crlf="yes">

tests/data/test955+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -13,7 +13,6 @@ REPLY MAIL 501 not fine enough
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test956+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@e
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test957+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ VRFY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 8 - CURLE_WEIRD_SERVER_REPLY

tests/data/test958+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ VRFY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -32,7 +31,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren@examp
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 8 - CURLE_WEIRD_SERVER_REPLY

tests/data/test959+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -13,7 +13,6 @@ REPLY MAIL 501 not fine enough
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -41,7 +40,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test96+1 -2

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,7 +6,6 @@ TrackMemory
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>
@@ -24,7 +24,6 @@ curl memory tracking operational
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<file name="%LOGDIR/memdump">

tests/data/test960+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -5,12 +6,10 @@ SMTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -38,7 +37,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3%
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 55 - CURLE_SEND_ERROR

tests/data/test961+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ VRFY
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@%hex[%c3%a5%c3%a4%c3%b6]he
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 8 - CURLE_WEIRD_SERVER_REPLY

tests/data/test962+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ IDN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test963+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ IDN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3%
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test964+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,12 +8,10 @@ IDN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@%hex[%c3%a5%c3%a4%c3%b6]he
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test965+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ IDN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -14,7 +14,6 @@ CAPA SMTPUTF8
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test966+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ IDN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -14,7 +14,6 @@ CAPA SMTPUTF8
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -42,7 +41,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@%
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test967+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ IDN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -18,7 +18,6 @@ CAPA SMTPUTF8
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren@%hex[
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test968+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ IDN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -15,7 +15,6 @@ CAPA SMTPUTF8
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -37,7 +36,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test969+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ IDN
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -21,7 +21,6 @@ CAPA SMTPUTF8
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test97+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP POST
	HTTP replaced headers
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -19,7 +19,6 @@ blaha
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ HTTP POST with custom content-type
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers" nonewline="yes">

tests/data/test970+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -25,7 +25,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -48,7 +47,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{json}' -o %LOGDIR/out%TESTNU
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test971+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ options-in-versions
	</keywords>
	</info>

-	#
	# Client-side
	<client>
	<name>

tests/data/test972+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -25,7 +25,6 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor i
	</data>
	</reply>

-	#
	# Client-side
	<client>

@@ -49,7 +48,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -s --write-out '%{json}\n' -o %LOGDIR/out97
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test973+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -48,7 +48,6 @@ works

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -63,7 +62,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u joe:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test974+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -52,7 +52,6 @@ hey

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -69,7 +68,6 @@ HTTP with auth redirected to HTTP on a diff port w/o auth
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test975+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ FTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -48,7 +48,6 @@ works

	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -63,7 +62,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --location-trusted -u joe:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test976+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP proxy
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -52,7 +52,6 @@ hey

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -69,7 +68,6 @@ HTTP with auth redirected to HTTP on a diff port --location-trusted
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test977+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ cookies
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -23,7 +23,6 @@ Set-Cookie: a=b; Domain=.me.;

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -41,7 +40,6 @@ URL with trailing dot and receiving a cookie for the TLD with dot
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test978+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --stderr %LOGDIR/redir --silent -w '%{stder
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test979+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP Basic auth
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -29,7 +29,6 @@ final
	</data2>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://first:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u smith:doggie
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test98+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP PUT
	chunked Transfer-Encoding
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -19,7 +19,6 @@ blaha
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -36,7 +35,6 @@ data on stdin
	</stdin>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test980+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ STARTTLS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -17,7 +17,6 @@ REPLY AUTH 535 5.7.8 Authentication credentials invalid
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -37,7 +36,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 8 is CURLE_WEIRD_SERVER_REPLY

tests/data/test981+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ STARTTLS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -16,7 +16,6 @@ REPLY LOGIN A003 BAD Authentication credentials invalid
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -44,7 +43,6 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 8 is CURLE_WEIRD_SERVER_REPLY

tests/data/test982+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ STARTTLS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -25,7 +25,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -42,7 +41,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 8 is CURLE_WEIRD_SERVER_REPLY

tests/data/test983+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ STARTTLS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>

tests/data/test984+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ STARTTLS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -14,7 +14,6 @@ REPLY CAPABILITY A001 BAD Not implemented
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -42,7 +41,6 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 64 is CURLE_USE_SSL_FAILED

tests/data/test985+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ STARTTLS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -23,7 +23,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -40,7 +39,6 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl-reqd
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 64 is CURLE_USE_SSL_FAILED

tests/data/test986+1 -1

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ STARTTLS
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>

tests/data/test987+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ UPLOAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ body
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test988+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ FETCH
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -20,7 +20,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ IMAPS FETCH with redundant explicit SSL request
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test989+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ RETR
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="yes">
@@ -20,7 +20,6 @@ body
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ POP3S RETR with redundant explicit SSL request
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test99+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -8,7 +9,6 @@ Largefile
	FAILURE
	</keywords>
	</info>
-	#
	# Server-side
	<reply>
	<data>
@@ -31,7 +31,6 @@ Funny-head: yesyes
	</datacheck>
	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -48,7 +47,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 9999999999
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	# 33 is CURLE_RANGE_ERROR

tests/data/test990+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -40,7 +39,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%output{%LOGDIR/output}%{http_code}\n'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test991+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers">
@@ -26,7 +26,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -43,7 +42,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%output{>>%LOGDIR/output}%{http_code}'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test992+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,7 +8,6 @@ UPLOAD
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -17,7 +17,6 @@ REPLY dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB 235 Authenticated
	</servercmd>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -34,7 +33,6 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test993+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -7,14 +8,12 @@ LIST
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
	%repeat[1000 x 95 328485%0d%0a]%</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +27,6 @@ pop3://%HOSTIP:%POP3PORT/ -u user:secret
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test994+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -31,7 +30,6 @@ content
	</file2>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stderr mode="text">

tests/data/test995+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data crlf="headers" nocheck="yes">
@@ -25,7 +25,6 @@ Funny-head: yesyes
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -39,7 +38,6 @@ http
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test996+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,12 +7,10 @@ HTTP GET
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -28,7 +27,6 @@ content
	</file>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<stderr mode="text">

tests/data/test997+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -9,7 +10,6 @@ RFC2449
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<servercmd>
@@ -19,7 +19,6 @@ CAPA TOP USER
	</data>
	</reply>

-	#
	# Client-side
	<client>
	<server>
@@ -33,7 +32,6 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X 'STAT'
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="yes">

tests/data/test998+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data>
@@ -49,7 +49,6 @@ Funny-head: yesyes

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -66,7 +65,6 @@ HTTP with auth in URL redirected to another host
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/data/test999+1 -3

@@ -1,3 +1,4 @@
+	<?xml version="1.0" encoding="US-ASCII"?>
	<testcase>
	<info>
	<keywords>
@@ -6,7 +7,6 @@ HTTP
	</keywords>
	</info>

-	#
	# Server-side
	<reply>
	<data nocheck="yes">
@@ -39,7 +39,6 @@ Funny-head: yesyes

	</reply>

-	#
	# Client-side
	<client>
	<features>
@@ -56,7 +55,6 @@ HTTP with auth in first URL but not second
	</command>
	</client>

-	#
	# Verify data after the test has been "shot"
	<verify>
	<protocol crlf="headers">

tests/getpart.pm+10 -0

@@ -240,6 +240,16 @@ sub loadtest {
	push @xml, $_;
	}
	close($xmlh);
+	if(!@xml) {
+	print STDERR "file $file is empty!\n";
+	return 1;
+	}
+	my $prolog = @xml[0];
+	chomp $prolog;
+	if($prolog ne '<?xml version="1.0" encoding="US-ASCII"?>') {
+	print STDERR "file $file missing the XML prolog!\n";
+	return 1;
+	}
	}
	else {
	# failure