← Commit list

4d2a05d3fe

Viktor Szakats

2025-10-31

SUCCESS Duration: 147s

Subject

tests: use `crlf=yes` attribute more

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 →

tests/data/test100+9 -9

@@ -41,15 +41,15 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD test-%TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD test-%TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1000+6 -6

@@ -31,12 +31,12 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ -I
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1003+10 -10

@@ -33,16 +33,16 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1004+6 -6

@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy ""
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1005+10 -10

@@ -33,16 +33,16 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1006+10 -10

@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test101+8 -8

@@ -43,14 +43,14 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	PORT 127,0,0,1,243,212
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	PORT 127,0,0,1,243,212
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1010+10 -10

@@ -42,16 +42,16 @@ ftp://%HOSTIP:%FTPPORT//list/this/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT//list
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST /list/this/path/%TESTNUMBER
-	EPSV
-	LIST /list/this/path/%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST /list/this/path/%TESTNUMBER
+	EPSV
+	LIST /list/this/path/%TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1011+13 -13

@@ -56,19 +56,19 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /blah/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	mooGET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	POST /blah/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	mooGET /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1012+15 -15

@@ -56,21 +56,21 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post301
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /blah/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /blah/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
	moo
	</protocol>
	</verify>

tests/data/test1015+8 -8

@@ -38,14 +38,14 @@ content to _?!#$'\|<>
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 119
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 119
+	Content-Type: application/x-www-form-urlencoded
+
	my+name+is+moo%5B%5D&y e s=s_i_r&v_alue=content+to+_%3F%21%23%24%27%7C%3C%3E%0A&content+to+_%3F%21%23%24%27%7C%3C%3E%0A
	</protocol>
	</verify>

tests/data/test102+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1021+23 -23

@@ -106,29 +106,29 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	GET /path/%TESTNUMBER0002 HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	GET /path/%TESTNUMBER0002 HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1024+17 -17

@@ -84,23 +84,23 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /data/%TESTNUMBER0002.txt HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/%TESTNUMBER0003.txt HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: firstcookie=want
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /data/%TESTNUMBER0002.txt HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/%TESTNUMBER0003.txt HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: firstcookie=want
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1025+19 -19

@@ -84,25 +84,25 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: forcedcookie=yes
-
-	GET /data/%TESTNUMBER0002.txt HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: forcedcookie=yes
-
-	GET /want/%TESTNUMBER0003.txt HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: firstcookie=want; forcedcookie=yes
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: forcedcookie=yes
+
+	GET /data/%TESTNUMBER0002.txt HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: forcedcookie=yes
+
+	GET /want/%TESTNUMBER0003.txt HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: firstcookie=want; forcedcookie=yes
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1028+14 -14

@@ -52,20 +52,20 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER0002
-	RETR %TESTNUMBER0002
-	QUIT
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER0002
+	RETR %TESTNUMBER0002
+	QUIT
	</protocol>
	<stdout>
	HTTP/1.1 302 OK

tests/data/test1029+6 -6

@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url} %{url} %{ex

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 301 This is a weirdo text message swsclose

tests/data/test103+11 -11

@@ -38,17 +38,17 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER -P -
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD a
-	CWD path
-	PORT 127,0,0,1,0,0
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD a
+	CWD path
+	PORT 127,0,0,1,0,0
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1031+11 -11

@@ -59,17 +59,17 @@ http://%HOSTIP:%HTTPPORT/want/this/%TESTNUMBER -L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/this/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/this/%TESTNUMBER?coolsite=yes/%TESTNUMBER0002.txt HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/this/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/this/%TESTNUMBER?coolsite=yes/%TESTNUMBER0002.txt HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1032+7 -7

@@ -42,13 +42,13 @@ HTTP HEAD with --range
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	HEAD /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=1-3
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	HEAD /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=1-3
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1033+6 -6

@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1036+11 -11

@@ -40,17 +40,17 @@ This is the start!!

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 20
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 20
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	<file name="%LOGDIR/curl%TESTNUMBER.out">
	This is the start!!

tests/data/test1037+10 -10

@@ -39,16 +39,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1038+9 -9

@@ -34,15 +34,15 @@ worx?

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	APPE %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	APPE %TESTNUMBER
+	QUIT
	</protocol>
	<upload>
	cr@p******** that we're gonna upload

tests/data/test1039+9 -9

@@ -34,15 +34,15 @@ worx?

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	<upload>
	this is the ***cr@p****** that we're gonna upload

tests/data/test104+11 -11

@@ -27,17 +27,17 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER --head

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD a
-	CWD path
-	MDTM %TESTNUMBER
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 0
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD a
+	CWD path
+	MDTM %TESTNUMBER
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 0
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1040+7 -7

@@ -65,13 +65,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=100-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=100-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1042+7 -7

@@ -80,13 +80,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200
	<errorcode>
	33
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=200-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=200-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1043+7 -7

@@ -70,13 +70,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=40-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=40-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1044+10 -10

@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD blalbla
-	MDTM %TESTNUMBER
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 0
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD blalbla
+	MDTM %TESTNUMBER
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 0
+	QUIT
	</protocol>
	<stdout>
	Last-Modified: Sat, 26 Jul 2008 10:26:59 GMT

tests/data/test1045+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --interface %CLIENTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1046+6 -6

@@ -43,12 +43,12 @@ HTTP-IPv6 GET with numeric localhost --interface
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1047+8 -8

@@ -43,14 +43,14 @@ ftp://%HOSTIP:%FTPPORT/ --interface %CLIENTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1048+8 -8

@@ -48,14 +48,14 @@ FTP-IPv6 dir list PASV with localhost --interface
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test105+9 -9

@@ -37,15 +37,15 @@ ftp://userdude:passfellow@%HOSTIP:%FTPPORT/%TESTNUMBER --use-ascii

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER userdude
-	PASS passfellow
-	PWD
-	EPSV
-	PASV
-	TYPE A
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER userdude
+	PASS passfellow
+	PWD
+	EPSV
+	PASV
+	TYPE A
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1054+15 -15

@@ -58,21 +58,21 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @%LOGDIR/test%TESTNUMBER.txt --p
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /blah/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 10
-	Content-Type: application/x-www-form-urlencoded
-
-	field=dataPOST /blah/moo/testcase/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 10
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /blah/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 10
+	Content-Type: application/x-www-form-urlencoded
+
+	field=dataPOST /blah/moo/testcase/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 10
+	Content-Type: application/x-www-form-urlencoded
+
	field=data
	</protocol>
	</verify>

tests/data/test1056+11 -11

@@ -66,17 +66,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /moo/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /moo/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1057+11 -11

@@ -36,17 +36,17 @@ FTP retrieve a byte-range relative to end of file

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 52
-	RETR %TESTNUMBER
-	ABOR
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 52
+	RETR %TESTNUMBER
+	ABOR
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1058+7 -7

@@ -39,13 +39,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r -101

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=-101
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=-101
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1059+6 -6

@@ -46,12 +46,12 @@ ftp://test-number:%TESTNUMBER/wanted/page -p -x %HOSTIP:%HTTPPORT
	<errorcode>
	56
	</errorcode>
-	<protocol>
-	CONNECT test-number:%TESTNUMBER HTTP/1.1
-	Host: test-number:%TESTNUMBER
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	CONNECT test-number:%TESTNUMBER HTTP/1.1
+	Host: test-number:%TESTNUMBER
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test106+11 -11

@@ -35,17 +35,17 @@ FTP GET with type=A style ASCII URL using %20 codes

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD /
-	CWD path with spaces
-	CWD and things2
-	EPSV
-	TYPE A
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD /
+	CWD path with spaces
+	CWD and things2
+	EPSV
+	TYPE A
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1060+17 -17

@@ -83,23 +83,23 @@ http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="e1fbed39c26f4efe284adc0e576ff638"
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	GET /path/%TESTNUMBER0002 HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="e1fbed39c26f4efe284adc0e576ff638"
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	GET /path/%TESTNUMBER0002 HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1061+17 -17

@@ -88,23 +88,23 @@ http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="4e23449fa93224834299e7282a70472c"
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	GET /path/%TESTNUMBER0002 HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se.%TESTNUMBER:8990", response="4e23449fa93224834299e7282a70472c"
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	GET /path/%TESTNUMBER0002 HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1062+10 -10

@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1066+11 -11

@@ -41,17 +41,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUM

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 200 OK

tests/data/test1067+13 -13

@@ -59,19 +59,19 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --silent --location --referer "firston

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Referer: firstone.html
-
-	GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Referer: http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Referer: firstone.html
+
+	GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Referer: http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER
+
	</protocol>
	<stderr nonewline="yes">
	\|http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER\|

tests/data/test107+8 -8

@@ -38,14 +38,14 @@ that FTP
	works
	so does it?
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1070+9 -9

@@ -48,15 +48,15 @@ Here's 2000 x 'O':
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Expect: 100-continue
-	Content-Length: 2313
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Expect: 100-continue
+	Content-Length: 2313
+	Content-Type: application/x-www-form-urlencoded
+
	This creates
	</protocol>
	</verify>

tests/data/test1074+11 -11

@@ -60,17 +60,17 @@ Connection: close
	surprise2
	</stdout>

-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /wantmore/%TESTNUMBER0001 HTTP/1.0
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /wantmore/%TESTNUMBER0001 HTTP/1.0
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1076+15 -15

@@ -56,21 +56,21 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post302
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /blah/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /blah/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
	moo
	</protocol>
	</verify>

tests/data/test1077+13 -13

@@ -57,19 +57,19 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002 HTTP/1.0
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER0002 HTTP/1.0
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1078+11 -11

@@ -60,17 +60,17 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.0
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.0
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 200 Mighty fine indeed

tests/data/test1079+12 -12

@@ -59,18 +59,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
	<errorcode>
	52
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="e340c7cdca0950462070f46ee139e9f7"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="e340c7cdca0950462070f46ee139e9f7"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test108+11 -11

@@ -36,17 +36,17 @@ Moooooooooooo
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD CWD
-	CWD STOR
-	CWD RETR
-	PORT 127,0,0,1,5,109
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD CWD
+	CWD STOR
+	CWD RETR
+	PORT 127,0,0,1,5,109
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	<upload>
	Moooooooooooo

tests/data/test1080+11 -11

@@ -36,17 +36,17 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/wan

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 301 This is a weirdo text message swsclose

tests/data/test1081+11 -11

@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/wan

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/want/our/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/want/our/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 301 This is a weirdo text message swsclose

tests/data/test1082+6 -6

@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface 127.0.0.1
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1083+6 -6

@@ -46,12 +46,12 @@ HTTP-IPv6 GET with ip6-localhost --interface
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1086+8 -8

@@ -49,14 +49,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -m 5
	<errorcode>
	28
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
	</protocol>
	</verify>
	</testcase>

tests/data/test1087+20 -20

@@ -88,26 +88,26 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
-	Host: first.host.it.is
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
-	Host: first.host.it.is
-	Authorization: Basic %b64[iam:myself]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
-	Host: goto.second.host.now
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
+	Host: first.host.it.is
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
+	Host: first.host.it.is
+	Authorization: Basic %b64[iam:myself]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
+	Host: goto.second.host.now
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1088+21 -21

@@ -89,27 +89,27 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
-	Host: first.host.it.is
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
-	Host: first.host.it.is
-	Authorization: Basic %b64[iam:myself]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
-	Host: goto.second.host.now
-	Authorization: Basic %b64[iam:myself]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
+	Host: first.host.it.is
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
+	Host: first.host.it.is
+	Authorization: Basic %b64[iam:myself]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1
+	Host: goto.second.host.now
+	Authorization: Basic %b64[iam:myself]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1089+11 -11

@@ -50,17 +50,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{si
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test109+8 -8

@@ -31,14 +31,14 @@ Moooooooooooo

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	APPE %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	APPE %TESTNUMBER
+	QUIT
	</protocol>
	<upload>
	Moooooooooooo

tests/data/test1090+11 -11

@@ -57,17 +57,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n%{num_redirects}\n%{si
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test1091+12 -12

@@ -30,18 +30,18 @@ FTP URL with type=i

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD /
-	CWD tmp
-	CWD moo
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD /
+	CWD tmp
+	CWD moo
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1092+7 -7

@@ -43,13 +43,13 @@ FTP with type=i over HTTP proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER;type=i HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1095+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/%TESTNUMBER", response="df3246f44d2bc8de0e9f8fc4d7cf6e95"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="test \"this\" realm!!", nonce="1053604145", uri="/%TESTNUMBER", response="df3246f44d2bc8de0e9f8fc4d7cf6e95"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1096+13 -13

@@ -33,19 +33,19 @@ ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir/%TESTNUMBER
	<errorcode>
	78
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD dir
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD dir
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1097+14 -14

@@ -59,20 +59,20 @@ http://test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT/%TESTNUMBER --proxy http

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	CONNECT test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	CONNECT test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: test.a.galaxy.far.far.away.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	dummy=value
	</protocol>

tests/data/test11+11 -11

@@ -59,17 +59,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test110+11 -11

@@ -36,17 +36,17 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 20

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 20
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 20
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1100+22 -22

@@ -80,28 +80,28 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L -d "stuff to

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 18
-	Content-Type: application/x-www-form-urlencoded
-
-	stuff to send awayGET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 18
+	Content-Type: application/x-www-form-urlencoded
+
+	stuff to send awayGET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1101+7 -7

@@ -42,13 +42,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/gimme/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /gimme/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /gimme/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1102+12 -12

@@ -34,18 +34,18 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	SYST
-	SITE NAMEFMT 1
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	SYST
+	SITE NAMEFMT 1
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1103+10 -10

@@ -33,16 +33,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	SYST
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	SYST
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1104+14 -14

@@ -69,20 +69,20 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Cookie: test2=true
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Cookie: test2=true
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1105+8 -8

@@ -45,14 +45,14 @@ local-http

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 33
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 33
+	Content-Type: application/x-www-form-urlencoded
+
	userid=myname&password=mypassword
	</protocol>
	<file name="%LOGDIR/cookie%TESTNUMBER.txt" mode="text">

tests/data/test1106+7 -7

@@ -44,13 +44,13 @@ ftp://%HOSTIP:23456/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET ftp://%HOSTIP:23456/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:23456
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET ftp://%HOSTIP:23456/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:23456
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1107+10 -10

@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	PRET RETR %TESTNUMBER
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	PRET RETR %TESTNUMBER
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1108+5 -5

@@ -31,11 +31,11 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-pret

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	PRET RETR %TESTNUMBER
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	PRET RETR %TESTNUMBER
	</protocol>
	# we expect that the server doesn't understand PRET
	<errorcode>

tests/data/test1109+6 -6

@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER#test

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test111+8 -8

@@ -32,14 +32,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 2000
	<errorcode>
	36
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1110+6 -6

@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER?q=foobar HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER?q=foobar HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1111+6 -6

@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER?q=foobar#fragment#fragment2

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER?q=foobar HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER?q=foobar HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1112+10 -10

@@ -52,16 +52,16 @@ FTPS download with strict timeout and slow data transfer
	<errorcode>
	28
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PBSZ 0
-	PROT C
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PBSZ 0
+	PROT C
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
	</protocol>
	</verify>
	</testcase>

tests/data/test1113+39 -39

@@ -40,45 +40,45 @@ FTP wildcard download - changed fnmatch, 2x perform (DOS LIST response)
	0
	</errorcode>
	# THERE SHOULD NOT BE "SIZE"! and one "USER/PASS"
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD fully_simulated
-	CWD DOS
-	EPSV
-	TYPE A
-	LIST
-	EPSV
-	TYPE I
-	RETR chmod1
-	EPSV
-	RETR chmod2
-	EPSV
-	RETR chmod3
-	EPSV
-	RETR empty_file.dat
-	EPSV
-	RETR file.txt
-	EPSV
-	RETR someothertext.txt
-	EPSV
-	TYPE A
-	LIST
-	EPSV
-	TYPE I
-	RETR chmod1
-	EPSV
-	RETR chmod2
-	EPSV
-	RETR chmod3
-	EPSV
-	RETR empty_file.dat
-	EPSV
-	RETR file.txt
-	EPSV
-	RETR someothertext.txt
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD fully_simulated
+	CWD DOS
+	EPSV
+	TYPE A
+	LIST
+	EPSV
+	TYPE I
+	RETR chmod1
+	EPSV
+	RETR chmod2
+	EPSV
+	RETR chmod3
+	EPSV
+	RETR empty_file.dat
+	EPSV
+	RETR file.txt
+	EPSV
+	RETR someothertext.txt
+	EPSV
+	TYPE A
+	LIST
+	EPSV
+	TYPE I
+	RETR chmod1
+	EPSV
+	RETR chmod2
+	EPSV
+	RETR chmod3
+	EPSV
+	RETR empty_file.dat
+	EPSV
+	RETR file.txt
+	EPSV
+	RETR someothertext.txt
+	QUIT
	</protocol>
	<stdout>
	This file should have permissions 444

tests/data/test1115+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1116+6 -6

@@ -60,12 +60,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/heads%TESTNUMBER">
	HTTP/1.1 200 funky chunky!

tests/data/test1117+13 -13

@@ -69,19 +69,19 @@ Content-Type: text/plain
	partial body
	</stdout>

-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=10-22
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /wantmore/%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=10-22
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=10-22
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /wantmore/%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=10-22
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1118+6 -6

@@ -42,12 +42,12 @@ http://%HOSTIP:%[email protected]/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /[email protected]/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /[email protected]/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test112+8 -8

@@ -31,14 +31,14 @@ worx?

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	APPE %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	APPE %TESTNUMBER
+	QUIT
	</protocol>
	<upload>
	gonna upload

tests/data/test1120+5 -5

@@ -32,11 +32,11 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER
	# Verify data after the test has been "shot"
	<verify>
	# Strip all valid kinds of PORT and EPRT that curl can send
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD a
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD a
	</protocol>
	# CURLE_OPERATION_TIMEDOUT is 28
	<errorcode>

tests/data/test1121+6 -6

@@ -34,12 +34,12 @@ HTTP multiple provided Host: headers
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: host1
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: host1
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1122+8 -8

@@ -61,14 +61,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Connection: TE
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Connection: TE
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1123+8 -8

@@ -171,14 +171,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Connection: TE
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Connection: TE
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1124+8 -8

@@ -62,14 +62,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Connection: TE
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Connection: TE
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1125+8 -8

@@ -61,14 +61,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: close"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Connection: close, TE
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Connection: close, TE
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1126+7 -7

@@ -38,13 +38,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1127+7 -7

@@ -47,13 +47,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1128+13 -13

@@ -48,19 +48,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -z
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
	</protocol>

	<stdout>

tests/data/test1129+17 -17

@@ -74,23 +74,23 @@ Content-Type: text/html

	-foo-
	</stdout>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 1053700
-	Content-Type: application/x-www-form-urlencoded
-	Expect: 100-continue
-
-	POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 1053700
-	Content-Type: application/x-www-form-urlencoded
-	Expect: 100-continue
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 1053700
+	Content-Type: application/x-www-form-urlencoded
+	Expect: 100-continue
+
+	POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 1053700
+	Content-Type: application/x-www-form-urlencoded
+	Expect: 100-continue
+
	</protocol>
	<limits>
	Maximum allocated: 3200000

tests/data/test113+2 -2

@@ -30,8 +30,8 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<errorcode>
	67
	</errorcode>
-	<protocol>
-	USER anonymous
+	<protocol crlf="yes">
+	USER anonymous
	</protocol>
	</verify>
	</testcase>

tests/data/test1130+17 -17

@@ -75,23 +75,23 @@ Content-Type: text/html

	-foo-
	</stdout>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Expect: 100-continue
-	Content-Length: 100
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Expect: 100-continue
-	Content-Length: 100
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Expect: 100-continue
+	Content-Length: 100
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Expect: 100-continue
+	Content-Length: 100
+	Content-Type: application/x-www-form-urlencoded
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1131+15 -15

@@ -75,21 +75,21 @@ Content-Type: text/html

	FAILURE2
	</stdout>
-	<protocol>
-	PUT /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Expect: 100-continue
-	Content-Length: 100
-
-	PUT /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Expect: 100-continue
-	Content-Length: 100
-
+	<protocol crlf="yes">
+	PUT /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Expect: 100-continue
+	Content-Length: 100
+
+	PUT /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Expect: 100-continue
+	Content-Length: 100
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1137+9 -9

@@ -38,15 +38,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ignore-content-length

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test114+3 -3

@@ -30,9 +30,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<errorcode>
	67
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
	</protocol>
	</verify>
	</testcase>

tests/data/test1141+13 -13

@@ -54,19 +54,19 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://foo.example.com/want/%TESTNUMBER0001 HTTP/1.1
-	Host: foo.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://foo.example.com/want/%TESTNUMBER0001 HTTP/1.1
+	Host: foo.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1142+7 -7

@@ -49,13 +49,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	# 3, CURLE_URL_MALFORMAT for the four slashes
	<errorcode>

tests/data/test1143+6 -6

@@ -37,12 +37,12 @@ MSYS2_ARG_CONV_EXCL=http:/

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1144+6 -6

@@ -54,12 +54,12 @@ HTTP HEAD, receive no headers only body
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	HEAD /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	HEAD /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	8

tests/data/test1147+8 -8

@@ -51,14 +51,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	One: 1
-	Two: 2
-	And A Funny One : wohoo
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	One: 1
+	Two: 2
+	And A Funny One : wohoo
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1148+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr %LOGDIR/stderrlog%TESTNUMBER

	#
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# Check that the progress finished at 100% and has the right bar width.

tests/data/test1149+15 -15

@@ -42,21 +42,21 @@ ftp://%HOSTIP:%FTPPORT/list/this/path/%TESTNUMBER/ --ftp-method multicwd --next
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD list
-	CWD this
-	CWD path
-	CWD %TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	CWD /
-	EPSV
-	LIST list/this/path/%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD list
+	CWD this
+	CWD path
+	CWD %TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	CWD /
+	EPSV
+	LIST list/this/path/%TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test115+7 -7

@@ -32,13 +32,13 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<errorcode>
	13
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1150+13 -13

@@ -39,19 +39,19 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://test.remote.example.com.%TESTNUMBER:150/path HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:150
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://test.remote.example.com.%TESTNUMBER:1234/path/ HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:1234
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://test.remote.example.com.%TESTNUMBER:150/path HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:150
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://test.remote.example.com.%TESTNUMBER:1234/path/ HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:1234
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1151+6 -6

@@ -48,12 +48,12 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
	# Netscape HTTP Cookie File

tests/data/test1152+9 -9

@@ -45,15 +45,15 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD test-%TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD test-%TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1153+9 -9

@@ -45,15 +45,15 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD test-%TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD test-%TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1154+6 -6

@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# 100 == CURLE_TOO_LARGE
	<errorcode>

tests/data/test1155+6 -6

@@ -37,12 +37,12 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
	# Netscape HTTP Cookie File

tests/data/test1157+6 -6

@@ -45,12 +45,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1159+6 -6

@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 301 This is a weirdo text message swsclose

tests/data/test1160+6 -6

@@ -38,12 +38,12 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
	# Netscape HTTP Cookie File

tests/data/test1161+6 -6

@@ -37,12 +37,12 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
	# Netscape HTTP Cookie File

tests/data/test1162+10 -10

@@ -37,16 +37,16 @@ MSYS2_ARG_CONV_EXCL=ftp://
	</setenv>
	</client>
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD fully_simulated
-	CWD DOS
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD fully_simulated
+	CWD DOS
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	# 78 == CURLE_REMOTE_FILE_NOT_FOUND
	<errorcode>

tests/data/test1163+10 -10

@@ -33,16 +33,16 @@ FTP wildcard with pattern ending with an open-bracket
	</command>
	</client>
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD fully_simulated
-	CWD DOS
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD fully_simulated
+	CWD DOS
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	# 78 == CURLE_REMOTE_FILE_NOT_FOUND
	<errorcode>

tests/data/test1164+6 -6

@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{size_download}\n' --http0.9
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout mode="text">
	208

tests/data/test1166+11 -11

@@ -36,17 +36,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUM

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1168+13 -13

@@ -59,19 +59,19 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -u "catmai#d:#DZaRJYrixKE*gFY"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /data/%TESTNUMBER0002.txt HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /data/%TESTNUMBER0002.txt HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test117+8 -8

@@ -31,14 +31,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<errorcode>
	17
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1170+8 -8

@@ -61,14 +61,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection:"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Connection: TE
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Connection: TE
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1171+8 -8

@@ -61,14 +61,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection;"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Connection: TE
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Connection: TE
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1172+6 -6

@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-http0.9
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# unsupported protocol
	<errorcode>

tests/data/test1174+6 -6

@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# unsupported protocol
	<errorcode>

tests/data/test1176+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o '%LOGDIR/base-#0'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/base-#0">
	HTTP/1.1 200 OK

tests/data/test1178+8 -8

@@ -40,14 +40,14 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test118+10 -10

@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<errorcode>
	19
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1180+7 -7

@@ -36,13 +36,13 @@ HTTP GET request with proxy and -H "Proxy-Connection: keep-alive"
	</client>

	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1181+7 -7

@@ -36,13 +36,13 @@ HTTP GET request with proxy and "Proxy-Connection: Keep-Alive"
	</client>

	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1183+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify that the %TESTNUMBER has been resolved to %TESTNUMBER
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1184+11 -11

@@ -71,17 +71,17 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
-	Accept: /
-	User-Agent: %TESTNUMBER-agent
-
-	GET /we/want/that/page/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
-	Accept: /
-	User-Agent: %TESTNUMBER-agent
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
+	Accept: /
+	User-Agent: %TESTNUMBER-agent
+
+	GET /we/want/that/page/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
+	Accept: /
+	User-Agent: %TESTNUMBER-agent
+
	</protocol>
	<stdout>
	HTTP/1.1 200 Mighty fine indeed

tests/data/test1187+19 -19

@@ -41,26 +41,26 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	Content-Type: multipart/mixed; boundary=----------------------------
-	Mime-Version: 1.0
-
-	------------------------------
-
-	This is the mail text
-	------------------------------
-	Content-Disposition: attachment; filename="strange\\file\"name"
-
-	File content
-	--------------------------------
-	.
+	<upload crlf="yes">
+	Content-Type: multipart/mixed; boundary=----------------------------
+	Mime-Version: 1.0
+
+	------------------------------
+
+	This is the mail text
+	------------------------------
+	Content-Disposition: attachment; filename="strange\\file\"name"
+
+	File content
+	--------------------------------
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test1188+11 -11

@@ -32,17 +32,17 @@ http

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stderr mode="text">
	0 says 22 The requested URL returned error: 404

tests/data/test119+8 -8

@@ -38,14 +38,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -P -
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1197+13 -13

@@ -50,19 +50,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{method}\n" -L -d "twinkle twinkle lit
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 27
-	Content-Type: application/x-www-form-urlencoded
-
-	twinkle twinkle little starGET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 27
+	Content-Type: application/x-www-form-urlencoded
+
+	twinkle twinkle little starGET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test12+7 -7

@@ -42,13 +42,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 100-200

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=100-200
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=100-200
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test120+11 -11

@@ -37,17 +37,17 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE file"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	DELE file
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	DELE file
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1200+2 -2

@@ -32,8 +32,8 @@ gopher://%HOSTIP:%GOPHERPORT/1/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	/%TESTNUMBER
+	<protocol crlf="yes">
+	/%TESTNUMBER
	</protocol>
	</verify>
	</testcase>

tests/data/test1201+2 -2

@@ -32,8 +32,8 @@ gopher://%HOSTIP:%GOPHERPORT/1/selector/SELECTOR/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	/selector/SELECTOR/%TESTNUMBER
+	<protocol crlf="yes">
+	/selector/SELECTOR/%TESTNUMBER
	</protocol>
	</verify>
	</testcase>

tests/data/test1202+2 -2

@@ -33,8 +33,8 @@ Gopher query
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	/the/search/engine query succeeded/%TESTNUMBER
+	<protocol crlf="yes">
+	/the/search/engine query succeeded/%TESTNUMBER
	</protocol>
	</verify>
	</testcase>

tests/data/test1203+2 -2

@@ -36,8 +36,8 @@ Gopher IPv6 index
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	/moo/%TESTNUMBER
+	<protocol crlf="yes">
+	/moo/%TESTNUMBER
	</protocol>
	</verify>
	</testcase>

tests/data/test1204+12 -12

@@ -61,18 +61,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1205+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test121+11 -11

@@ -35,17 +35,17 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "-DELE after_transfer" -Q "DELE before_tra

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	DELE before_transfer
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	DELE after_transfer
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	DELE before_transfer
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	DELE after_transfer
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1210+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER?junk -J -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER?junk HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER?junk HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/%TESTNUMBER">
	12345

tests/data/test1212+7 -7

@@ -40,13 +40,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/ulion/%TESTNUMBER --socks5 non-existing-hos

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /ulion/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /ulion/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1213+7 -7

@@ -42,13 +42,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://we.want.that.site.com.%TESTNUMBER/ HTTP/1.1
-	Host: we.want.that.site.com.%TESTNUMBER
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://we.want.that.site.com.%TESTNUMBER/ HTTP/1.1
+	Host: we.want.that.site.com.%TESTNUMBER
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1214+7 -7

@@ -42,13 +42,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://we.want.that.site.com.%TESTNUMBER/?moo=foo HTTP/1.1
-	Host: we.want.that.site.com.%TESTNUMBER
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://we.want.that.site.com.%TESTNUMBER/?moo=foo HTTP/1.1
+	Host: we.want.that.site.com.%TESTNUMBER
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1215+15 -15

@@ -76,21 +76,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm --proxy http://

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1216+14 -14

@@ -47,20 +47,20 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://example.fake/c/%TESTNUMBER HTTP/1.1
-	Host: example.fake
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Cookie: moo3=indeed; moo2=indeed
-
-	GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1
-	Host: bexample.fake
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://example.fake/c/%TESTNUMBER HTTP/1.1
+	Host: example.fake
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Cookie: moo3=indeed; moo2=indeed
+
+	GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1
+	Host: bexample.fake
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1217+15 -15

@@ -37,21 +37,21 @@ ftp://%HOSTIP:%FTPPORT/get/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/get/file/agai
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD get/file
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	CWD /this/is/the/path
-	CWD get/file/again
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD get/file
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	CWD /this/is/the/path
+	CWD get/file/again
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1218+20 -20

@@ -40,26 +40,26 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://example.fake/c/%TESTNUMBER HTTP/1.1
-	Host: example.fake
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://example.fake/c/%TESTNUMBER HTTP/1.1
-	Host: example.fake
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Cookie: bug=fixed
-
-	GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1
-	Host: bexample.fake
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://example.fake/c/%TESTNUMBER HTTP/1.1
+	Host: example.fake
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://example.fake/c/%TESTNUMBER HTTP/1.1
+	Host: example.fake
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Cookie: bug=fixed
+
+	GET http://bexample.fake/c/%TESTNUMBER HTTP/1.1
+	Host: bexample.fake
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1219+7 -7

@@ -37,13 +37,13 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test122+9 -9

@@ -31,15 +31,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C 5

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1221+8 -8

@@ -39,14 +39,14 @@ content to _?!#$'\|<>
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER?my+name+is+moo%5b%5d&yes=s+i+r&v_alue=content+to+_%3f%21%23%24%27%7c%3c%3e%0a&content+to+_%3f%21%23%24%27%7c%3c%3e%0a&%3d%3d HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 24
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER?my+name+is+moo%5b%5d&yes=s+i+r&v_alue=content+to+_%3f%21%23%24%27%7c%3c%3e%0a&content+to+_%3f%21%23%24%27%7c%3c%3e%0a&%3d%3d HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 24
+	Content-Type: application/x-www-form-urlencoded
+
	start=once+upon+the+time
	</protocol>
	</verify>

tests/data/test1223+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'IP %{remote_ip} and PORT %{remote_port}
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 200 OK

tests/data/test1224+10 -10

@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD /
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD /
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1225+17 -17

@@ -34,23 +34,23 @@ ftp://%HOSTIP:%FTPPORT//foo/%TESTNUMBER ftp://%HOSTIP:%FTPPORT//foo/bar/%TESTNUM

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD /
-	CWD foo
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	CWD /
-	CWD foo
-	CWD bar
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD /
+	CWD foo
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	CWD /
+	CWD foo
+	CWD bar
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1226+10 -10

@@ -34,16 +34,16 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method singlecwd

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD /
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD /
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1227+9 -9

@@ -34,15 +34,15 @@ ftp://%HOSTIP:%FTPPORT//%TESTNUMBER --ftp-method nocwd

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE /%TESTNUMBER
-	RETR /%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE /%TESTNUMBER
+	RETR /%TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1228+14 -14

@@ -39,20 +39,20 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://example.fake/hoge/%TESTNUMBER HTTP/1.1
-	Host: example.fake
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://example.fake/hogege/ HTTP/1.1
-	Host: example.fake
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Cookie: path1=root
-
+	<protocol crlf="yes">
+	GET http://example.fake/hoge/%TESTNUMBER HTTP/1.1
+	Host: example.fake
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://example.fake/hogege/ HTTP/1.1
+	Host: example.fake
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Cookie: path1=root
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1229+12 -12

@@ -66,18 +66,18 @@ http://%5cuser%22:password@%HOSTIP:%HTTPPORT/%TESTNUMBER --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="f2694d426040712584c156d3de72b8d6"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="\\user\"", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="f2694d426040712584c156d3de72b8d6"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test123+7 -7

@@ -28,13 +28,13 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 51

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1230+11 -11

@@ -62,17 +62,17 @@ http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/%TESTNUMBER -p -x %HOSTIP:%HT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CONNECT [1234:1234:1234::4ce]:%HTTPPORT HTTP/1.1
-	Host: [1234:1234:1234::4ce]:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	GET /wanted/page/%TESTNUMBER HTTP/1.1
-	Host: [1234:1234:1234::4ce]:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	CONNECT [1234:1234:1234::4ce]:%HTTPPORT HTTP/1.1
+	Host: [1234:1234:1234::4ce]:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	GET /wanted/page/%TESTNUMBER HTTP/1.1
+	Host: [1234:1234:1234::4ce]:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1231+11 -11

@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMB
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /hej/but/%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /hej/but/%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1232+13 -13

@@ -49,19 +49,19 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER0001 HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://test.remote.haxx.se.%TESTNUMBER:8990/hej/but/%TESTNUMBER0001 HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1233+10 -10

@@ -32,16 +32,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1235+21 -21

@@ -40,27 +40,27 @@ multiple requests using {}{} in the URL

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 200 OK

tests/data/test1237+7 -7

@@ -33,13 +33,13 @@ URL with 1000+ letter user name + password

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1239+7 -7

@@ -41,13 +41,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "-dec 12 12:00:00 1999 GMT" -w '%{respon
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-Unmodified-Since: Sun, 12 Dec 1999 12:00:00 GMT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-Unmodified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
	</protocol>
	<stdout nonewline="yes">
	HTTP/1.1 200 OK

tests/data/test124+10 -10

@@ -32,16 +32,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1240+11 -11

@@ -31,17 +31,17 @@ glob [0-1] with stuff after range (7.33.0 regression)

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /00/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /01/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /00/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /01/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1241+13 -13

@@ -48,19 +48,19 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001 HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER?stupid=me/../%TESTNUMBER HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://test.remote.haxx.se.%TESTNUMBER:8990/../../hej/but/who/../%TESTNUMBER0001 HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1244+7 -7

@@ -50,13 +50,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:
	<errorcode>
	56
	</errorcode>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1245+6 -6

@@ -42,12 +42,12 @@ ftp
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# 1 - Protocol ftp not supported or disabled in libcurl
	<errorcode>

tests/data/test1246+13 -13

@@ -48,19 +48,19 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT/ HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://no-scheme-url.com.%TESTNUMBER:%HTTPPORT/ HTTP/1.1
-	Host: no-scheme-url.com.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT/ HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://no-scheme-url.com.%TESTNUMBER:%HTTPPORT/ HTTP/1.1
+	Host: no-scheme-url.com.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1248+7 -7

@@ -38,13 +38,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENP

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1249+7 -7

@@ -41,13 +41,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENP

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1250+7 -7

@@ -39,13 +39,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --noproxy %HOSTIP --max-time 5

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1251+7 -7

@@ -40,13 +40,13 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --max-time 5

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1252+6 -6

@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --noproxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1253+7 -7

@@ -42,13 +42,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
-	Host: somewhere.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
+	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1254+7 -7

@@ -42,13 +42,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
-	Host: somewhere.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
+	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1255+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --noproxy %HOSTIP

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1256+7 -7

@@ -44,13 +44,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
-	Host: somewhere.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
+	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1257+7 -7

@@ -44,13 +44,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
-	Host: somewhere.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://somewhere.example.com/%TESTNUMBER HTTP/1.1
+	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1258+12 -12

@@ -39,18 +39,18 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: localhost
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/want?hoge=fuga HTTP/1.1
-	Host: localhost
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: I-am=here
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: localhost
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/want?hoge=fuga HTTP/1.1
+	Host: localhost
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: I-am=here
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1259+7 -7

@@ -33,13 +33,13 @@ HTTP URL with semicolon in password

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:pass]b64%O3dvcmQ=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:pass]b64%O3dvcmQ=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test126+11 -11

@@ -32,17 +32,17 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD blalbla
-	CWD lululul
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD blalbla
+	CWD lululul
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1261+6 -6

@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' --locati

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# CURLE_TOO_MANY_REDIRECTS
	<errorcode>

tests/data/test1262+7 -7

@@ -28,13 +28,13 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "-1 jan 2001"
	</client>

	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD blalbla
-	MDTM %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD blalbla
+	MDTM %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1265+6 -6

@@ -46,12 +46,12 @@ http://%HOST6IP:%HTTP6PORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1266+6 -6

@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1267+6 -6

@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test127+12 -12

@@ -29,18 +29,18 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER --disable-epsv

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	CWD to
-	CWD file
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	CWD to
+	CWD file
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1270+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' -s

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test1271+6 -6

@@ -35,12 +35,12 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @%LOGDIR/blank%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1272+2 -2

@@ -36,8 +36,8 @@ Gophers index
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	/%TESTNUMBER
+	<protocol crlf="yes">
+	/%TESTNUMBER
	</protocol>
	</verify>
	</testcase>

tests/data/test1273+7 -7

@@ -69,13 +69,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - -f

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=100-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=100-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1274+6 -6

@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/out%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/out%TESTNUMBER">
	HTTP/1.1 200 OK

tests/data/test1277+9 -9

@@ -178,15 +178,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Accept-Encoding: xxx
-	Connection: TE
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Accept-Encoding: xxx
+	Connection: TE
+
	</protocol>
	</verify>
	</testcase>

tests/data/test128+16 -16

@@ -35,23 +35,23 @@ the

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
-	<upload>
-	file
-	with Unix newlines
-	meant to be
-	converted
-	with
-	the
-	--crlf option
+	<upload crlf="yes">
+	file
+	with Unix newlines
+	meant to be
+	converted
+	with
+	the
+	--crlf option
	</upload>
	</verify>
	</testcase>

tests/data/test1280+21 -21

@@ -33,27 +33,27 @@ http://%HOSTIP:%HTTPPORT/[a-d]/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /a/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /b/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /c/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /d/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /a/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /b/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /c/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /d/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1282+3 -3

@@ -29,9 +29,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
	</protocol>

	# 67 == CURLE_LOGIN_DENIED

tests/data/test1283+6 -6

@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/%TESTNUMBER -o "%LOGDIR/outfil

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /a1b2/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /a1b2/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/outfile%TESTNUMBER_a1b2.dump">
	HTTP/1.1 200 OK

tests/data/test1284+16 -16

@@ -67,22 +67,22 @@ HTTP POST --digest with user-specified Content-Length header

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="5763079608de439072861a59ac733515"
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="5763079608de439072861a59ac733515"
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	junkelijunk
	</protocol>
	</verify>

tests/data/test1286+18 -18

@@ -89,24 +89,24 @@ HTTP GET --digest increasing nonce-count
	<strippart>
	if(s/^(Authorization: Digest )([^\r\n]+)(\r?\n)$//) { $_ = $1 . join(', ', map { s/^(cnonce=)"[a-zA-Z0-9+\/=]+"$/$1REMOVED/; s/^(response=)"[a-f0-9]{32}"$/$1REMOVED/; s/^qop="auth"$/qop=auth/; $_ } sort split(/, */, $2)) . $3; }
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER", username="auser"
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER0001", username="auser"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER", username="auser"
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER0001", username="auser"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1287+6 -6

@@ -76,12 +76,12 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
	* Ignoring Content-Length in CONNECT 200 response

tests/data/test1288+6 -6

@@ -59,12 +59,12 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# This test is structured to test all the expectations of

tests/data/test129+6 -6

@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# CURLE_UNSUPPORTED_PROTOCOL
	<errorcode>

tests/data/test1290+6 -6

@@ -35,12 +35,12 @@ Verify URL globbing ignores []

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/[]/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/[]/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1292+6 -6

@@ -37,12 +37,12 @@ Replaced internal headers with a blank one
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host:
-	User-Agent: curl/%VERSION
-	Accept:
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host:
+	User-Agent: curl/%VERSION
+	Accept:
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1293+13 -13

@@ -50,19 +50,19 @@ http://0 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F=
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 138
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data
-
-
-	--------------------------------
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 138
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data
+
+
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test1294+7 -7

@@ -51,13 +51,13 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Among other public buildings in a certain town, which for many reasons it will be prudent to refrain from mentioning, and to which I will assign no fictitious name, there is one anciently common to most towns, great or small to ___, a workhouse; and in this workhouse was born; on a day and date which I need not trouble myself to repeat, inasmuch as it can be of no possible consequence to the reader, in this stage of the business at all events; the item of mortality whose name is prefixed to the head of this chapter: 511
-
+	<protocol crlf="yes">
+	GET /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Among other public buildings in a certain town, which for many reasons it will be prudent to refrain from mentioning, and to which I will assign no fictitious name, there is one anciently common to most towns, great or small to ___, a workhouse; and in this workhouse was born; on a day and date which I need not trouble myself to repeat, inasmuch as it can be of no possible consequence to the reader, in this stage of the business at all events; the item of mortality whose name is prefixed to the head of this chapter: 511
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1295+9 -9

@@ -51,15 +51,15 @@ http://%HOSTIP:%HTTPPORT/0123456790123456790123456790123456790123456790123456790
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300
-	Content-Length: 165
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679012345679: 300
+	Content-Length: 165
+	Content-Type: application/x-www-form-urlencoded
+
	Mr. Sherlock Holmes, who was usually very late in the mornings, save upon those not infrequent occasions when he was up all night, was seated at the breakfast table.
	</protocol>
	<stdout>

tests/data/test1296+7 -7

@@ -41,13 +41,13 @@ http://user%0aname:password@%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user%0aname:password]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user%0aname:password]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1297+6 -6

@@ -50,12 +50,12 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# 52 - got nothing
	<errorcode>

tests/data/test1298+7 -7

@@ -42,13 +42,13 @@ HTTP GET special path with --request-target
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET XXX HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Testno: %TESTNUMBER
-
+	<protocol crlf="yes">
+	GET XXX HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Testno: %TESTNUMBER
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1299+7 -7

@@ -41,13 +41,13 @@ Send "OPTIONS *" with --request-target
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	OPTIONS * HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Testno: %TESTNUMBER
-
+	<protocol crlf="yes">
+	OPTIONS * HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Testno: %TESTNUMBER
+
	</protocol>
	</verify>
	</testcase>

tests/data/test13+6 -6

@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -X DELETE

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	DELETE /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	DELETE /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test130+8 -8

@@ -50,14 +50,14 @@ default login userdef password passwddef
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER user1
-	PASS passwd1
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER user1
+	PASS passwd1
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test131+8 -8

@@ -47,14 +47,14 @@ machine %HOSTIP login user2 password passwd2
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER user2
-	PASS passwd2
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER user2
+	PASS passwd2
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1310+6 -6

@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/junk -J -O --show-headers --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /junk HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /junk HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/name%TESTNUMBER">
	HTTP/1.1 200 OK

tests/data/test1311+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/name%TESTNUMBER">
	12345

tests/data/test1312+6 -6

@@ -39,12 +39,12 @@ HTTP GET with -J, Content-Disposition and ; in filename
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/name%TESTNUMBER;weird">
	12345

tests/data/test1313+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/name%TESTNUMBER">
	12345

tests/data/test1314+13 -13

@@ -63,19 +63,19 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://firstplace.example.com/want/%TESTNUMBER HTTP/1.1
-	Host: firstplace.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://somewhere.example.com/reply/%TESTNUMBER HTTP/1.1
-	Host: somewhere.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://firstplace.example.com/want/%TESTNUMBER HTTP/1.1
+	Host: firstplace.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://somewhere.example.com/reply/%TESTNUMBER HTTP/1.1
+	Host: somewhere.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1316+8 -8

@@ -60,14 +60,14 @@ ftp://ftp.%TESTNUMBER:%FTPPORT/ -p -x %HOSTIP:%PROXYPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1317+6 -6

@@ -43,12 +43,12 @@ HTTP with --resolve
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: example.com:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1318+11 -11

@@ -43,17 +43,17 @@ HTTP with --resolve and same host name using different cases
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: MiXeDcAsE.cOm:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: mixedcase.com:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: MiXeDcAsE.cOm:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: mixedcase.com:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1319+6 -6

@@ -63,12 +63,12 @@ pop3://pop.%TESTNUMBER:%POP3PORT/%TESTNUMBER -p -x %HOSTIP:%PROXYPORT -u user:se
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	<proxy>
	CONNECT pop.%TESTNUMBER:%POP3PORT HTTP/1.1

tests/data/test132+8 -8

@@ -47,14 +47,14 @@ machine %HOSTIP login user2 password passwd2
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER mary
-	PASS mark
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER mary
+	PASS mark
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1320+12 -12

@@ -46,19 +46,19 @@ smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected]
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	<proxy>
	CONNECT smtp.%TESTNUMBER:%SMTPPORT HTTP/1.1

tests/data/test1321+6 -6

@@ -59,12 +59,12 @@ IMAP FETCH tunneled through HTTP proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	<proxy>
	CONNECT imap.%TESTNUMBER:%IMAPPORT HTTP/1.1

tests/data/test1322+6 -6

@@ -44,12 +44,12 @@ HTTP with --resolve and hostname with trailing dot
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: example.com.:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: example.com.:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1324+6 -6

@@ -48,12 +48,12 @@ HTTP with --resolve and [ipv6address]
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: example.com:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: example.com:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1325+15 -15

@@ -58,21 +58,21 @@ http://%HOSTIP:%HTTPPORT/we/%TESTNUMBER -L -d "moo"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /we/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	mooPOST /we/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /we/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	mooPOST /we/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
	moo
	</protocol>
	</verify>

tests/data/test1326+3 -3

@@ -40,9 +40,9 @@ telnet://%HOSTIP:%HTTPPORT --upload-file -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.0
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1327+3 -3

@@ -39,9 +39,9 @@ telnet://%HOSTIP:%HTTPPORT -T %LOGDIR/%TESTNUMBER.txt
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.0
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1328+11 -11

@@ -54,17 +54,17 @@ HTTP GET a globbed range with -f
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0000 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0000 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test133+8 -8

@@ -47,14 +47,14 @@ machine %HOSTIP login mary password drfrank
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER mary
-	PASS drfrank
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER mary
+	PASS drfrank
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1331+15 -15

@@ -72,21 +72,21 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://z.x.com/%TESTNUMBER HTTP/1.1
-	Host: z.x.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://z.x.com/%TESTNUMBER HTTP/1.1
-	Host: z.x.com
-	Proxy-Authorization: Basic %b64[myname:mypassword]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Cookie: proxycookie=weirdo
-
+	<protocol crlf="yes">
+	GET http://z.x.com/%TESTNUMBER HTTP/1.1
+	Host: z.x.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://z.x.com/%TESTNUMBER HTTP/1.1
+	Host: z.x.com
+	Proxy-Authorization: Basic %b64[myname:mypassword]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Cookie: proxycookie=weirdo
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1332+15 -15

@@ -57,21 +57,21 @@ http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d "moo" --post303
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /blah/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /blah/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	mooPOST /blah/moo.html&testcase=/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
	moo
	</protocol>
	</verify>

tests/data/test1333+10 -10

@@ -38,16 +38,16 @@ HTTP POST zero length, chunked-encoded
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Transfer-Encoding: chunked
-	Content-Type: application/x-www-form-urlencoded
-
-	0
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Transfer-Encoding: chunked
+	Content-Type: application/x-www-form-urlencoded
+
+	0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1334+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1335+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir="%LOGDIR"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1336+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1337+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1338+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER --output-
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1339+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test134+8 -8

@@ -49,14 +49,14 @@ machine %HOSTIP login user2 password passwd2
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER romulus
-	PASS rhemus
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER romulus
+	PASS rhemus
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1340+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER -w "curl
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/name%TESTNUMBER">

tests/data/test1341+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl saved to filename %{fil
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/name%TESTNUMBER">

tests/data/test1342+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1343+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1344+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1345+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1346+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1347+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/%TESTNUMBER">

tests/data/test1348+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1349+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --out

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test135+11 -11

@@ -38,17 +38,17 @@ FTP retrieve a byte-range

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 4
-	RETR %TESTNUMBER
-	ABOR
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 4
+	RETR %TESTNUMBER
+	ABOR
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1350+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1351+10 -10

@@ -30,16 +30,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER --

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1352+10 -10

@@ -30,16 +30,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1353+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER --

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1354+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1355+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1356+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1357+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --out

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1358+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1359+10 -10

@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER --

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test136+9 -9

@@ -28,15 +28,15 @@ FTP with user and no password

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER user
-	PASS
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER user
+	PASS
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1360+10 -10

@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1361+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER --

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1362+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1363+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i --output-dir %LOGDIR

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/file%TESTNUMBER">

tests/data/test1364+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/he
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1365+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1366+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/he
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1367+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1368+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1369+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test137+11 -11

@@ -31,17 +31,17 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD blalbla
-	CWD lululul
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD blalbla
+	CWD lululul
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1370+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1371+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1372+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1373+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1374+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1375+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1376+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1377+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1378+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1379+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test138+11 -11

@@ -34,17 +34,17 @@ ftp://%HOSTIP:%FTPPORT/blalbla/lululul/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD blalbla
-	CWD lululul
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD blalbla
+	CWD lululul
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1380+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D -

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1381+10 -10

@@ -30,16 +30,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1382+10 -10

@@ -30,16 +30,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1383+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1384+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1385+10 -10

@@ -29,16 +29,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1386+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1387+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1388+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D -

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1389+10 -10

@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test139+11 -11

@@ -31,17 +31,17 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 1989"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD blalbla
-	MDTM %TESTNUMBER
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD blalbla
+	MDTM %TESTNUMBER
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1390+10 -10

@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1391+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1392+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test1393+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE file%TESTNUMBER
-	RETR file%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE file%TESTNUMBER
+	RETR file%TESTNUMBER
+	QUIT
	</protocol>

	<file1 name="%LOGDIR/download%TESTNUMBER">

tests/data/test14+6 -6

@@ -30,12 +30,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -i --head

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	HEAD /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	HEAD /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test140+7 -7

@@ -30,13 +30,13 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -z "1 jan 2004"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD blalbla
-	MDTM %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD blalbla
+	MDTM %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1400+6 -6

@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stripfile>
	s/(USERAGENT, \")[^\"]+/${1}stripped/

tests/data/test1401+10 -10

@@ -48,16 +48,16 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[fake:user]b64%
-	User-Agent: MyUA
-	Accept: /
-	Cookie: chocolate=chip
-	X-Files: Mulder
-	X-Men: cyclops, iceman
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[fake:user]b64%
+	User-Agent: MyUA
+	Accept: /
+	Cookie: chocolate=chip
+	X-Files: Mulder
+	X-Men: cyclops, iceman
+
	</protocol>
	<stripfile>
	# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with

tests/data/test1402+8 -8

@@ -41,14 +41,14 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 16
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 16
+	Content-Type: application/x-www-form-urlencoded
+
	foo=bar&baz=quux
	</protocol>
	<stripfile>

tests/data/test1403+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER?foo=bar&baz=quux HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER?foo=bar&baz=quux HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stripfile>
	# curl's default user-agent varies with version, libraries etc.

tests/data/test1405+15 -15

@@ -45,21 +45,21 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	NOOP 1
-	FAIL
-	EPSV
-	PASV
-	TYPE I
-	NOOP 2
-	FAIL HARD
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	NOOP 3
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	NOOP 1
+	FAIL
+	EPSV
+	PASV
+	TYPE I
+	NOOP 2
+	FAIL HARD
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	NOOP 3
+	QUIT
	</protocol>
	<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
	/******* Sample code generated by the curl command line tool ********

tests/data/test1406+13 -13

@@ -47,20 +47,20 @@ ftp
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]> SIZE=38
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]> SIZE=38
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
	/******* Sample code generated by the curl command line tool ********

tests/data/test1407+6 -6

@@ -42,12 +42,12 @@ ftp
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	LIST %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	LIST %TESTNUMBER
+	QUIT
	</protocol>
	<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
	/******* Sample code generated by the curl command line tool ********

tests/data/test1408+12 -12

@@ -56,18 +56,18 @@ HTTP receive cookies over IPV6
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /path/%TESTNUMBER0001 HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /path/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: time=1
-
+	<protocol crlf="yes">
+	GET /path/%TESTNUMBER0001 HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /path/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: time=1
+
	</protocol>
	</verify>
	</testcase>

tests/data/test141+10 -10

@@ -32,16 +32,16 @@ ftp://%HOSTIP:%FTPPORT/blalbla/%TESTNUMBER -I

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD blalbla
-	MDTM %TESTNUMBER
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 0
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD blalbla
+	MDTM %TESTNUMBER
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 0
+	QUIT
	</protocol>
	<stdout>
	Last-Modified: Wed, 09 Apr 2003 10:26:59 GMT

tests/data/test1411+7 -7

@@ -46,13 +46,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/empty%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	PUT /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-
+	<protocol crlf="yes">
+	PUT /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1412+23 -23

@@ -101,29 +101,29 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth http://%HOST

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="0390dbe89e31adca0413d11f91f30e7f"
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER0001", response="0085df91870374c8bf4e94415e7fbf8e"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER", response="0390dbe89e31adca0413d11f91f30e7f"
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/%TESTNUMBER0001", response="0085df91870374c8bf4e94415e7fbf8e"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1413+11 -11

@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/this/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /this/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /this/moo.html/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /this/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /this/moo.html/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1415+7 -7

@@ -64,13 +64,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://example.com/we/want/%TESTNUMBER HTTP/1.1
-	Host: example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://example.com/we/want/%TESTNUMBER HTTP/1.1
+	Host: example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>

	<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">

tests/data/test1416+6 -6

@@ -44,12 +44,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# 56 = CURLE_RECV_ERROR

tests/data/test1417+6 -6

@@ -56,12 +56,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/heads%TESTNUMBER">
	HTTP/1.1 200 funky chunky!

tests/data/test142+159 -159

@@ -26,165 +26,165 @@ ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/par

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD part1
-	CWD part2
-	CWD part3
-	CWD part4
-	CWD part5
-	CWD part6
-	CWD part7
-	CWD part8
-	CWD part9
-	CWD part10
-	CWD part11
-	CWD part12
-	CWD part13
-	CWD part14
-	CWD part15
-	CWD part16
-	CWD part17
-	CWD part18
-	CWD part19
-	CWD part20
-	CWD part21
-	CWD part22
-	CWD part23
-	CWD part24
-	CWD part25
-	CWD part26
-	CWD part27
-	CWD part28
-	CWD part29
-	CWD part30
-	CWD part31
-	CWD part32
-	CWD part33
-	CWD part34
-	CWD part35
-	CWD part36
-	CWD part37
-	CWD part38
-	CWD part39
-	CWD part40
-	CWD part41
-	CWD part42
-	CWD part43
-	CWD part44
-	CWD part45
-	CWD part46
-	CWD part47
-	CWD part48
-	CWD part49
-	CWD part50
-	CWD part51
-	CWD part52
-	CWD part53
-	CWD part54
-	CWD part55
-	CWD part56
-	CWD part57
-	CWD part58
-	CWD part59
-	CWD part60
-	CWD part61
-	CWD part62
-	CWD part63
-	CWD part64
-	CWD part65
-	CWD part66
-	CWD part67
-	CWD part68
-	CWD part69
-	CWD part70
-	CWD part71
-	CWD part72
-	CWD part73
-	CWD part74
-	CWD part75
-	CWD part76
-	CWD part77
-	CWD part78
-	CWD part79
-	CWD part80
-	CWD part81
-	CWD part82
-	CWD part83
-	CWD part84
-	CWD part85
-	CWD part86
-	CWD part87
-	CWD part88
-	CWD part89
-	CWD part90
-	CWD part91
-	CWD part92
-	CWD part93
-	CWD part94
-	CWD part95
-	CWD part96
-	CWD part97
-	CWD part98
-	CWD part99
-	CWD part100
-	CWD part101
-	CWD part102
-	CWD part103
-	CWD part104
-	CWD part105
-	CWD part106
-	CWD part107
-	CWD part108
-	CWD part109
-	CWD part110
-	CWD part111
-	CWD part112
-	CWD part113
-	CWD part114
-	CWD part115
-	CWD part116
-	CWD part117
-	CWD part118
-	CWD part119
-	CWD part120
-	CWD part121
-	CWD part122
-	CWD part123
-	CWD part124
-	CWD part125
-	CWD part126
-	CWD part127
-	CWD part128
-	CWD part129
-	CWD part130
-	CWD part131
-	CWD part132
-	CWD part133
-	CWD part134
-	CWD part135
-	CWD part136
-	CWD part137
-	CWD part138
-	CWD part139
-	CWD part140
-	CWD part141
-	CWD part142
-	CWD part143
-	CWD part144
-	CWD part145
-	CWD part146
-	CWD part147
-	CWD part148
-	CWD part149
-	CWD part150
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD part1
+	CWD part2
+	CWD part3
+	CWD part4
+	CWD part5
+	CWD part6
+	CWD part7
+	CWD part8
+	CWD part9
+	CWD part10
+	CWD part11
+	CWD part12
+	CWD part13
+	CWD part14
+	CWD part15
+	CWD part16
+	CWD part17
+	CWD part18
+	CWD part19
+	CWD part20
+	CWD part21
+	CWD part22
+	CWD part23
+	CWD part24
+	CWD part25
+	CWD part26
+	CWD part27
+	CWD part28
+	CWD part29
+	CWD part30
+	CWD part31
+	CWD part32
+	CWD part33
+	CWD part34
+	CWD part35
+	CWD part36
+	CWD part37
+	CWD part38
+	CWD part39
+	CWD part40
+	CWD part41
+	CWD part42
+	CWD part43
+	CWD part44
+	CWD part45
+	CWD part46
+	CWD part47
+	CWD part48
+	CWD part49
+	CWD part50
+	CWD part51
+	CWD part52
+	CWD part53
+	CWD part54
+	CWD part55
+	CWD part56
+	CWD part57
+	CWD part58
+	CWD part59
+	CWD part60
+	CWD part61
+	CWD part62
+	CWD part63
+	CWD part64
+	CWD part65
+	CWD part66
+	CWD part67
+	CWD part68
+	CWD part69
+	CWD part70
+	CWD part71
+	CWD part72
+	CWD part73
+	CWD part74
+	CWD part75
+	CWD part76
+	CWD part77
+	CWD part78
+	CWD part79
+	CWD part80
+	CWD part81
+	CWD part82
+	CWD part83
+	CWD part84
+	CWD part85
+	CWD part86
+	CWD part87
+	CWD part88
+	CWD part89
+	CWD part90
+	CWD part91
+	CWD part92
+	CWD part93
+	CWD part94
+	CWD part95
+	CWD part96
+	CWD part97
+	CWD part98
+	CWD part99
+	CWD part100
+	CWD part101
+	CWD part102
+	CWD part103
+	CWD part104
+	CWD part105
+	CWD part106
+	CWD part107
+	CWD part108
+	CWD part109
+	CWD part110
+	CWD part111
+	CWD part112
+	CWD part113
+	CWD part114
+	CWD part115
+	CWD part116
+	CWD part117
+	CWD part118
+	CWD part119
+	CWD part120
+	CWD part121
+	CWD part122
+	CWD part123
+	CWD part124
+	CWD part125
+	CWD part126
+	CWD part127
+	CWD part128
+	CWD part129
+	CWD part130
+	CWD part131
+	CWD part132
+	CWD part133
+	CWD part134
+	CWD part135
+	CWD part136
+	CWD part137
+	CWD part138
+	CWD part139
+	CWD part140
+	CWD part141
+	CWD part142
+	CWD part143
+	CWD part144
+	CWD part145
+	CWD part146
+	CWD part147
+	CWD part148
+	CWD part149
+	CWD part150
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	<limits>
	Allocations: 170

tests/data/test1420+6 -6

@@ -48,12 +48,12 @@ ftp
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
	/******* Sample code generated by the curl command line tool ********

tests/data/test1422+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%FILE_PWD/%LOGDIR/name%TESTNUM
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/name%TESTNUMBER">

tests/data/test1423+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER file://%FILE_
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1424+7 -7

@@ -57,13 +57,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT" -o %LOGDIR/ou
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test1425+6 -6

@@ -49,12 +49,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 200 OK

tests/data/test1426+6 -6

@@ -49,12 +49,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --output -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout nonewline="yes">
	HTTP/1.1 200 OK

tests/data/test1428+8 -8

@@ -68,14 +68,14 @@ Proxy-Connection: Keep-Alive
	header-type: proxy

	</proxy>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	Authorization: Basic %b64[iam:my:;self]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	header-type: server
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	Authorization: Basic %b64[iam:my:;self]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	header-type: server
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1429+6 -6

@@ -57,12 +57,12 @@ Funny-head: yesyes
	-foo-
	999
	</stdout>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test143+11 -11

@@ -28,17 +28,17 @@ FTP URL with type=a

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD /
-	CWD tmp
-	CWD moo
-	EPSV
-	TYPE A
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD /
+	CWD tmp
+	CWD moo
+	EPSV
+	TYPE A
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1430+6 -6

@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# 1 - CURLE_UNSUPPORTED_PROTOCOL
	# Due to invalid HTTP response code

tests/data/test1431+6 -6

@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	1

tests/data/test1432+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	1

tests/data/test1433+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	1

tests/data/test1434+7 -7

@@ -76,13 +76,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 100

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=100-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=100-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1435+6 -6

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

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: server-interpreted.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: server-interpreted.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1436+16 -16

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

	<verify>
-	<protocol>
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: one.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: two.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0003 HTTP/1.1
-	Host: one.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: one.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: two.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0003 HTTP/1.1
+	Host: one.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 200 OK

tests/data/test1437+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER", response="4376eb639bf8e7343a6e7b56e1b89c4f", algorithm=MD5
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1438+6 -6

@@ -46,12 +46,12 @@ Content-Type: text/plain
	testdata
	http
	</stdout>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1439+6 -6

@@ -45,12 +45,12 @@ Content-Type: text/plain
	testdata
	1.1
	</stdout>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test144+8 -8

@@ -36,14 +36,14 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	PORT 127,0,0,1,243,212
-	TYPE A
-	NLST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	PORT 127,0,0,1,243,212
+	TYPE A
+	NLST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1443+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/%TESTNUMBER">
	12345

tests/data/test1444+10 -10

@@ -32,16 +32,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	MDTM %TESTNUMBER
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	MDTM %TESTNUMBER
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	# Verify the mtime of the file. The mtime is specifically chosen to be an even
	# number so that it can be represented exactly on a FAT file system.

tests/data/test1448+11 -11

@@ -57,17 +57,17 @@ http://%hex[%c3%a5%c3%a4%c3%b6]hex%.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: xn--4cab6c.se:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: xn--4cab6c.se:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: xn--4cab6c.se:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: xn--4cab6c.se:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test1449+6 -6

@@ -27,12 +27,12 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -r 36893488147419103232-

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test145+8 -8

@@ -38,14 +38,14 @@ ftp://%HOSTIP:%FTPPORT/ -P - -l
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	PORT 127,0,0,1,243,212
-	TYPE A
-	NLST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	PORT 127,0,0,1,243,212
+	TYPE A
+	NLST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1455+8 -8

@@ -50,14 +50,14 @@ proxy
	<strippart>
	s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %HTTPPORT/proxy-line/
	</strippart>
-	<protocol>
-	proxy-line
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Testno: %TESTNUMBER
-
+	<protocol crlf="yes">
+	proxy-line
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Testno: %TESTNUMBER
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1456+7 -7

@@ -55,13 +55,13 @@ proxy
	<strippart>
	s/PROXY TCP6 ::1 ::1 (\d+) (\d+)/PROXY TCP6 ::1 ::1 $2/
	</strippart>
-	<protocol>
-	PROXY TCP6 ::1 ::1 %HTTP6PORT
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	PROXY TCP6 ::1 ::1 %HTTP6PORT
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1457+6 -6

@@ -49,12 +49,12 @@ line1line3
	<stderr nonewline="yes">
	line2
	</stderr>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1458+6 -6

@@ -43,12 +43,12 @@ HTTP with wildcard --resolve
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: example.com:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test146+16 -16

@@ -34,22 +34,22 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNU
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD first
-	CWD dir
-	CWD here
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	CWD /
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD first
+	CWD dir
+	CWD here
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	CWD /
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1465+8 -8

@@ -45,14 +45,14 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 24
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 24
+	Content-Type: application/x-www-form-urlencoded
+
	%hex[ab%81cd%00e\"?%0D%0A%09%01fghi%1Ajklm%FD]hex%
	</protocol>
	<stripfile>

tests/data/test1466+6 -6

@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1467+6 -6

@@ -49,12 +49,12 @@ HTTP GET via SOCKS5 proxy via Unix sockets
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1468+6 -6

@@ -50,12 +50,12 @@ http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://localhost%SOC
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: this.is.a.host.name:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: this.is.a.host.name:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<socks>
	atyp 3 => this.is.a.host.name

tests/data/test147+14 -14

@@ -36,20 +36,20 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/%TESTNUMBER --ftp-create-dirs
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD first
-	MKD first
-	CWD first
-	CWD dir
-	CWD here
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD first
+	MKD first
+	CWD first
+	CWD dir
+	CWD here
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1470+6 -6

@@ -51,12 +51,12 @@ https://this.is.a.host.name:%HTTPSPORT/%TESTNUMBER --insecure --proxy socks5h://
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: this.is.a.host.name:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: this.is.a.host.name:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<socks>
	atyp 3 => this.is.a.host.name

tests/data/test1473+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1475+7 -7

@@ -71,13 +71,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - -f

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=100-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=100-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1479+11 -11

@@ -41,17 +41,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# weird_server_reply
	<errorcode>

tests/data/test148+8 -8

@@ -36,14 +36,14 @@ ftp://%HOSTIP:%FTPPORT/attempt/to/get/this/%TESTNUMBER --ftp-create-dirs
	<errorcode>
	9
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD attempt
-	MKD attempt
-	CWD attempt
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD attempt
+	MKD attempt
+	CWD attempt
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1480+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# weird_server_reply

tests/data/test1481+7 -7

@@ -42,13 +42,13 @@ http://moo/ --libcurl %LOGDIR/test%TESTNUMBER.c --tls-max 1.3 --proxy-tlsv1 -x h

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://moo/ HTTP/1.1
-	Host: moo
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://moo/ HTTP/1.1
+	Host: moo
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<stripfile>
	s/(USERAGENT, \")[^\"]+/${1}stripped/

tests/data/test1482+6 -6

@@ -60,12 +60,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/heads%TESTNUMBER">
	HTTP/1.1 200 funky chunky!

tests/data/test1483+6 -6

@@ -62,12 +62,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/heads%TESTNUMBER">
	HTTP/1.1 200 funky chunky!

tests/data/test1484+6 -6

@@ -42,12 +42,12 @@ HTTP HEAD with response body to ignore
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	HEAD /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	HEAD /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1485+5 -5

@@ -41,11 +41,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1487+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/name%TESTNUMBER">
	12345

tests/data/test149+13 -13

@@ -32,19 +32,19 @@ send away this contents
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD dir1
-	EPSV
-	TYPE I
-	STOR %TESTNUMBER
-	CWD /
-	CWD dir2
-	EPSV
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD dir1
+	EPSV
+	TYPE I
+	STOR %TESTNUMBER
+	CWD /
+	CWD dir2
+	EPSV
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	<file name="%LOGDIR/upload%TESTNUMBER">
	send away this contents

tests/data/test1492+6 -6

@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/junk%TESTNUMBER -J -O --show-headers --output-dir %LOGD
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /junk%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /junk%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/junk%TESTNUMBER">
	HTTP/1.1 200 OK

tests/data/test1493+6 -6

@@ -57,12 +57,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/heads%TESTNUMBER">
	HTTP/1.1 200 funky chunky!

tests/data/test1494+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>

tests/data/test1495+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	61

tests/data/test1496+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	61

tests/data/test1497+11 -11

@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 3 -o /dev/null
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test1499+11 -11

@@ -59,17 +59,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LO
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>

tests/data/test15+6 -6

@@ -44,12 +44,12 @@ Content-Length: 26
	Repeated nonsense-headers
	http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER 200 26
	</stdout>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test150+13 -13

@@ -74,19 +74,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm --fail

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1501+9 -9

@@ -42,15 +42,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
	<errorcode>
	0
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD %TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD %TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>

	</verify>

tests/data/test1502+5 -5

@@ -45,11 +45,11 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: google.com:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: google.com:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1503+5 -5

@@ -45,11 +45,11 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: google.com:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: google.com:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1504+5 -5

@@ -45,11 +45,11 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: google.com:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: google.com:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1505+5 -5

@@ -45,11 +45,11 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: google.com:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: google.com:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1506+41 -41

@@ -9,36 +9,36 @@ verbose logs

	# Server-side
	<reply>
-	<data1>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 47
-
+	<data1 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 47
+
	file contents should appear once for each file
	</data1>
-	<data2>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 47
-
+	<data2 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 47
+
	file contents should appear once for each file
	</data2>
-	<data3>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 47
-
+	<data3 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 47
+
	file contents should appear once for each file
	</data3>
-	<data4>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 47
-
+	<data4 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 47
+
	file contents should appear once for each file
	</data4>
	</reply>
@@ -64,23 +64,23 @@ HTTP GET connection cache limit (CURLMOPT_MAXCONNECTS)

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /path/%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER0003 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER0004 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /path/%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER0003 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER0004 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<strip>
	^Host:.*

tests/data/test1507+5 -5

@@ -39,11 +39,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<%[email protected]>
-	RCPT TO:<%[email protected]>
-	DATA
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<%[email protected]>
+	RCPT TO:<%[email protected]>
+	DATA
	</protocol>
	<upload>
	</upload>

tests/data/test151+6 -6

@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1510+17 -17

@@ -61,23 +61,23 @@ HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /path/%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER0003 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER0004 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /path/%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER0003 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER0004 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<strip>
	^Host:.*

tests/data/test1512+9 -9

@@ -60,15 +60,15 @@ GLOBAL CACHE test over two easy performs

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /path/%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /path/%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<strip>
	^Host:.*

tests/data/test1513+0 -2

@@ -37,8 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	</protocol>
	# 42 == CURLE_ABORTED_BY_CALLBACK
	<errorcode>
	42

tests/data/test1514+20 -20

@@ -39,26 +39,26 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<verify>
	# Content-Length header is not present
	# Transfer-Encoding header is added automatically
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Transfer-Encoding: chunked
-	Content-Type: application/x-www-form-urlencoded
-	Expect: 100-continue
-
-	1
-	d
-	1
-	u
-	1
-	m
-	1
-	m
-	1
-	y
-	0
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Transfer-Encoding: chunked
+	Content-Type: application/x-www-form-urlencoded
+	Expect: 100-continue
+
+	1
+	d
+	1
+	u
+	1
+	m
+	1
+	m
+	1
+	y
+	0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1517+7 -7

@@ -62,13 +62,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strippart>
	s/^(this is what we post to the silly web server)(\r)?\n//
	</strippart>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 45
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 45
+	Content-Type: application/x-www-form-urlencoded
+
	</protocol>
	<errorcode>
	0

tests/data/test1518+0 -2

@@ -46,8 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strippart>

	</strippart>
-	<protocol>
-	</protocol>
	<stdout>
	res 0
	status 302

tests/data/test1519+0 -2

@@ -46,8 +46,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strippart>

	</strippart>
-	<protocol>
-	</protocol>
	<stdout>
	res 0
	status 302

tests/data/test152+6 -6

@@ -35,12 +35,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	22

tests/data/test1520+18 -18

@@ -39,25 +39,25 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-
-	..
-	..
-
-	..
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+
+	..
+	..
+
+	..
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test153+29 -29

@@ -91,35 +91,35 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%H
	<strip>
	^Authorization.*cnonce
	</strip>
-	<protocol>
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0001", response="f4f83139396995bac665f24a1f1055c7"
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0002", response="f84511b014fdd0ba6494f42871079c32"
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/%TESTNUMBER0002", cnonce="MTA4MzIr", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0001", response="f4f83139396995bac665f24a1f1055c7"
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER0002", response="f84511b014fdd0ba6494f42871079c32"
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="999999", uri="/%TESTNUMBER0002", cnonce="MTA4MzIr", nc="00000001", qop="auth", response="25291c357671604a16c0242f56721c07", algorithm=MD5
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 401 Authorization Required swsclose

tests/data/test1531+7 -7

@@ -25,13 +25,13 @@ CURLOPT_POSTFIELDS with binary data set after multi_add_handle

	# it should be detected and an error should be reported
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 8
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 8
+	Content-Type: application/x-www-form-urlencoded
+
	%hex[%2eabc%00xyz]hex%
	</protocol>
	</verify>

tests/data/test1532+5 -5

@@ -36,11 +36,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<errorcode>
	0

tests/data/test1533+25 -25

@@ -43,31 +43,31 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<errorcode>
	41
	</errorcode>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	aaaPOST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	aaaPOST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
	aaa
	</protocol>
	</verify>

tests/data/test1534+5 -5

@@ -38,11 +38,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<errorcode>
	0

tests/data/test1535+5 -5

@@ -37,11 +37,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<errorcode>
	0

tests/data/test1536+5 -5

@@ -37,11 +37,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<errorcode>
	0

tests/data/test1540+5 -5

@@ -57,11 +57,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1541+5 -5

@@ -64,11 +64,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1542+17 -17

@@ -39,23 +39,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
	== Info: Connection #0 to host %HOSTIP:%HTTPPORT left intact

tests/data/test1543+9 -9

@@ -52,15 +52,15 @@ CURLOPT_CURLU, URL with space and CURLINFO_EFFECTIVE_URL
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%20/with/%20space/%20/file HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%20/with/%20space/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%20/with/%20space/%20/file HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%20/with/%20space/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<stdout>
	res 0

tests/data/test1546+8 -8

@@ -47,14 +47,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Connection: TE
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Connection: TE
+
	</protocol>
	<errorcode>
	61

tests/data/test1547+9 -9

@@ -42,15 +42,15 @@ ftp://%HOSTIP:%FTPPORT/test-%TESTNUMBER/ -P %CLIENTIP --ftp-pasv
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD test-%TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD test-%TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1551+17 -17

@@ -47,23 +47,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1552+0 -2

@@ -46,7 +46,5 @@ lib%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	</protocol>
	</verify>
	</testcase>

tests/data/test1553+0 -2

@@ -51,7 +51,5 @@ imap://non-existing-host.haxx.se:%IMAPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	</protocol>
	</verify>
	</testcase>

tests/data/test1555+0 -2

@@ -37,8 +37,6 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	</protocol>
	# 42 == CURLE_ABORTED_BY_CALLBACK
	<errorcode>
	42

tests/data/test1556+5 -5

@@ -46,11 +46,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<stdout>
	-foo-

tests/data/test1561+11 -11

@@ -76,17 +76,17 @@ Cookies set over HTTP can't override secure ones
	</command>
	</client>
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: www.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: www.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: www.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: www.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
	# Netscape HTTP Cookie File

tests/data/test1562+17 -17

@@ -48,23 +48,23 @@ Expire secure cookies over HTTPS
	</command>
	</client>
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: www.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: www.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: foo=123
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: www.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: www.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: www.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: foo=123
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: www.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test1563+6 -6

@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -L -H "Host: www.example.com"
	<errorcode>
	1
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: www.example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: www.example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test1566+7 -7

@@ -46,13 +46,13 @@ downloaded already
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-None-Match: "123456"
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-None-Match: "123456"
+
	</protocol>

	# verify that the target file is untouched

tests/data/test1567+17 -17

@@ -48,23 +48,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1568+12 -12

@@ -71,18 +71,18 @@ http://%HOSTIP/%TESTNUMBER %HTTPPORT

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: lib%TESTNUMBER
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9cbbd857a37e45f2bcad5c7d088191df"
-	User-Agent: lib%TESTNUMBER
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: lib%TESTNUMBER
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9cbbd857a37e45f2bcad5c7d088191df"
+	User-Agent: lib%TESTNUMBER
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1569+13 -13

@@ -40,19 +40,19 @@ lib%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE A
-	RETR %TESTNUMBER
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE A
+	RETR %TESTNUMBER
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	<stdout>

tests/data/test157+6 -6

@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1570+13 -13

@@ -40,19 +40,19 @@ lib1569

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE A
-	NLST
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE A
+	NLST
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	<stdout>

tests/data/test1571+1 -1

@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	IGLOO /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test1572+1 -1

@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	IGLOO /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test1575+1 -1

@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	IGLOO /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test1576+1 -1

@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	CURL /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test1577+1 -1

@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %TESTNUMBER
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	CURL /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test1578+1 -1

@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	CURL /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test158+13 -13

@@ -37,19 +37,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F name=daniel
	^Content-Type: multipart/form-data.*
	^-----------------------.*
	</strip>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 157
-	Content-Type: multipart/form-data; boundary=----------------------------4f12fcdaa3bc
-
-	------------------------------4f12fcdaa3bc
-	Content-Disposition: form-data; name="name"
-
-	daniel
-	------------------------------4f12fcdaa3bc--
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 157
+	Content-Type: multipart/form-data; boundary=----------------------------4f12fcdaa3bc
+
+	------------------------------4f12fcdaa3bc
+	Content-Disposition: form-data; name="name"
+
+	daniel
+	------------------------------4f12fcdaa3bc--
	</protocol>
	<errorcode>
	52

tests/data/test1580+1 -1

@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER 1578
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	CURL /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test1581+1 -1

@@ -78,7 +78,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	IGLOO /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test1582+5 -5

@@ -42,11 +42,11 @@ https://%HOSTIP:%HTTPSPORT/
	</client>

	<verify>
-	<protocol>
-	GET / HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET / HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test159+7 -7

@@ -60,13 +60,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -0

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.0
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.0
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1591+15 -15

@@ -40,21 +40,21 @@ more than one byte

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	PUT /bzz/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Transfer-Encoding: chunked
-	Trailer: my-super-awesome-trailer, my-other-awesome-trailer
-	Expect: 100-continue
-
-	e
-	Hello Cloud!
-
-	0
-	my-super-awesome-trailer: trail1
-	my-other-awesome-trailer: trail2
-
+	<protocol crlf="yes">
+	PUT /bzz/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Transfer-Encoding: chunked
+	Trailer: my-super-awesome-trailer, my-other-awesome-trailer
+	Expect: 100-continue
+
+	e
+	Hello Cloud!
+
+	0
+	my-super-awesome-trailer: trail1
+	my-other-awesome-trailer: trail2
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1593+5 -5

@@ -36,11 +36,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	<verify>
	# Note here the lack of If-Modified-Since
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1594+5 -5

@@ -36,11 +36,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<stdout>
	Retry-After 22

tests/data/test1595+5 -5

@@ -35,11 +35,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<stdout>
	Retry-After 0

tests/data/test1596+5 -5

@@ -36,11 +36,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	# Retry-After time is limited to 6 hours (21600 seconds)
	<stdout>

tests/data/test1598+14 -14

@@ -40,20 +40,20 @@ more than one byte

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /bzz/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Trailer: my-super-awesome-trailer, my-other-awesome-trailer
-	Transfer-Encoding: chunked
-	Content-Type: application/x-www-form-urlencoded
-
-	11
-	xxx=yyy&aaa=bbbbb
-	0
-	my-super-awesome-trailer: trail1
-	my-other-awesome-trailer: trail2
-
+	<protocol crlf="yes">
+	POST /bzz/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Trailer: my-super-awesome-trailer, my-other-awesome-trailer
+	Transfer-Encoding: chunked
+	Content-Type: application/x-www-form-urlencoded
+
+	11
+	xxx=yyy&aaa=bbbbb
+	0
+	my-super-awesome-trailer: trail1
+	my-other-awesome-trailer: trail2
+
	</protocol>
	</verify>
	</testcase>

tests/data/test16+8 -8

@@ -40,14 +40,14 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
-	Host: we.want.that.site.com
-	Proxy-Authorization: Basic %b64[fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+	Host: we.want.that.site.com
+	Proxy-Authorization: Basic %b64[fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test160+11 -11

@@ -57,17 +57,17 @@ Connection: close
	surprise2
	</stdout>

-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /wantmore/%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /wantmore/%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test161+8 -8

@@ -34,14 +34,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<verify>
	# This doesn't send QUIT because of known bug:
	# "7.8 Premature transfer end but healthy control channel"
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
	</protocol>
	# CURLE_PARTIAL_FILE = 18
	<errorcode>

tests/data/test1613+8 -8

@@ -40,14 +40,14 @@ proxy
	</client>

	<verify>
-	<protocol>
-	OPTIONS * HTTP/1.1
-	Host: www.example.org
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Testno: %TESTNUMBER
-
+	<protocol crlf="yes">
+	OPTIONS * HTTP/1.1
+	Host: www.example.org
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Testno: %TESTNUMBER
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1617+9 -9

@@ -61,15 +61,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: this" -H "Con
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Connection: this, TE
-	Connection: that
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Connection: this, TE
+	Connection: that
+
	</protocol>
	</verify>
	</testcase>

tests/data/test162+8 -8

@@ -44,14 +44,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-us

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<errorcode>
	22

tests/data/test1631+9 -9

@@ -73,15 +73,15 @@ User-Agent: curl
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1632+12 -12

@@ -88,18 +88,18 @@ User-Agent: curl
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER0002
-	RETR %TESTNUMBER0002
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER0002
+	RETR %TESTNUMBER0002
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1633+25 -25

@@ -69,31 +69,31 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -d moo --retry 1 -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	mooGET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-
-	mooGET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	mooGET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+
+	mooGET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1634+11 -11

@@ -55,17 +55,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1 --fail
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1635+11 -11

@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1 --fail-with-body
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	moo

tests/data/test164+7 -7

@@ -54,13 +54,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 0-10,12-15

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=0-10,12-15
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=0-10,12-15
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test165+13 -13

@@ -46,19 +46,19 @@ http://www.%hex[%c3%a5%c3%a4%c3%b6]hex%.se/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://www.xn--4cab6c.se/page/%TESTNUMBER HTTP/1.1
-	Host: www.xn--4cab6c.se
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://www.xn--groe-xna.de/page/%TESTNUMBER HTTP/1.1
-	Host: www.xn--groe-xna.de
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://www.xn--4cab6c.se/page/%TESTNUMBER HTTP/1.1
+	Host: www.xn--4cab6c.se
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://www.xn--groe-xna.de/page/%TESTNUMBER HTTP/1.1
+	Host: www.xn--groe-xna.de
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test167+16 -16

@@ -58,22 +58,22 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	Proxy-Authorization: Basic %b64[foo:bar]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	Proxy-Authorization: Basic %b64[foo:bar]b64%
-	Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="304c55b19dbcb9c7e7a3354abd11ba1b"
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	Proxy-Authorization: Basic %b64[foo:bar]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	Proxy-Authorization: Basic %b64[foo:bar]b64%
+	Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="304c55b19dbcb9c7e7a3354abd11ba1b"
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1670+6 -6

@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%header{etag} %header{nope} %header{DAT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout mode="text">
	"21025-dc7-39462498" Tue, 09 Nov 2010 14:49:00 GMT

tests/data/test168+22 -22

@@ -72,28 +72,28 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"
-	Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="bfecb43898f3db12543650d45493313b"
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="fb8608e00ad9239a3dedb14bc8575976"
+	Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="bfecb43898f3db12543650d45493313b"
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test169+22 -22

@@ -93,28 +93,28 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/%TESTNUMBER", response="89b737a4b6eefde285c093c92e9bd6ea"
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/%TESTNUMBER", response="89b737a4b6eefde285c093c92e9bd6ea"
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test17+6 -6

@@ -43,12 +43,12 @@ request MOOO

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	MOOO /that.site.com/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: agent007 license to drill
-	Accept: /
-
+	<protocol crlf="yes">
+	MOOO /that.site.com/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: agent007 license to drill
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test170+9 -9

@@ -34,15 +34,15 @@ http://a.galaxy.far.far.away/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --prox

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1
-	Host: a.galaxy.far.far.away
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Content-Length: 0
-
+	<protocol crlf="yes">
+	POST http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1
+	Host: a.galaxy.far.far.away
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Content-Length: 0
+
	</protocol>
	# 52 is CURLE_GOT_NOTHING
	<errorcode>

tests/data/test1700+11 -11

@@ -59,17 +59,17 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 http://%HOSTIP:%HTTP2PORT/%TESTNUM
	^X-Forwarded-Proto:.*
	^Via:.*
	</strip>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTP2PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTP2PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTP2PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTP2PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 101 Switching Protocols

tests/data/test1701+8 -8

@@ -50,14 +50,14 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 -d "datatosend"
	^X-Forwarded-Proto:.*
	^Via:.*
	</strip>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTP2PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 10
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTP2PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 10
+	Content-Type: application/x-www-form-urlencoded
+
	datatosend
	</protocol>
	<stdout>

tests/data/test1702+6 -6

@@ -49,12 +49,12 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 --head
	^X-Forwarded-Proto:.*
	^Via:.*
	</strip>
-	<protocol>
-	HEAD /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTP2PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	HEAD /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTP2PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 101 Switching Protocols

tests/data/test1704+9 -9

@@ -47,15 +47,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
	^X-Forwarded-Proto:.*
	^Via:.*
	</strip>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Upgrade: h2c
-	HTTP2-Settings: AAMAAABkAAQAAQAAAAIAAAAA
-	Connection: Upgrade, HTTP2-Settings
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Upgrade: h2c
+	HTTP2-Settings: AAMAAABkAAQAAQAAAAIAAAAA
+	Connection: Upgrade, HTTP2-Settings
+
	</protocol>

	# CURLE_WEIRD_SERVER_REPLY (8)

tests/data/test171+7 -7

@@ -41,13 +41,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://z.x.com/%TESTNUMBER HTTP/1.1
-	Host: z.x.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://z.x.com/%TESTNUMBER HTTP/1.1
+	Host: z.x.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<file name="%LOGDIR/jar%TESTNUMBER" mode="text">
	# Netscape HTTP Cookie File

tests/data/test1711+6 -6

@@ -40,12 +40,12 @@ RCPT TO:<[email protected]>
	DATA
	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	%repeat[5000 x test in body... ]%
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	%repeat[5000 x test in body... ]%
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test172+7 -7

@@ -45,13 +45,13 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: nodomain=value; partmatch=present; tool=curl; name=fool
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: nodomain=value; partmatch=present; tool=curl; name=fool
+
	</protocol>
	</verify>
	</testcase>

tests/data/test174+8 -8

@@ -35,14 +35,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -d "junkelij

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	junkelijunk
	</protocol>
	</verify>

tests/data/test175+15 -15

@@ -63,21 +63,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	junkelijunk
	</protocol>
	</verify>

tests/data/test176+16 -16

@@ -64,22 +64,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --ntlm -d "junkelijunk"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	junkelijunk
	</protocol>
	</verify>

tests/data/test177+8 -8

@@ -39,14 +39,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
	</protocol>
	</verify>
	</testcase>

tests/data/test178+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# weird_server_reply
	<errorcode>

tests/data/test179+8 -8

@@ -46,14 +46,14 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://supertrooper.fake/c/%TESTNUMBER HTTP/1.1
-	Host: supertrooper.fake
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Cookie: moo2=indeed
-
+	<protocol crlf="yes">
+	GET http://supertrooper.fake/c/%TESTNUMBER HTTP/1.1
+	Host: supertrooper.fake
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Cookie: moo2=indeed
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1800+9 -9

@@ -42,15 +42,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Upgrade: %H2CVER
-	HTTP2-Settings: AAMAAABkAAQAAQAAAAIAAAAA
-	Connection: Upgrade, HTTP2-Settings
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Upgrade: %H2CVER
+	HTTP2-Settings: AAMAAABkAAQAAQAAAAIAAAAA
+	Connection: Upgrade, HTTP2-Settings
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1801+9 -9

@@ -49,15 +49,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Connection: Upgrade, HTTP2-Settings
-	Upgrade: %H2CVER
-	HTTP2-Settings: AAMAAABkAARAAAAAAAIAAAAA
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Connection: Upgrade, HTTP2-Settings
+	Upgrade: %H2CVER
+	HTTP2-Settings: AAMAAABkAARAAAAAAAIAAAAA
+
	</protocol>
	# CURLE_HTTP2: Send failure: Broken pipe
	<errorcode>

tests/data/test182+9 -9

@@ -29,15 +29,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test183+13 -13

@@ -37,19 +37,19 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
-	Host: deathstar.another.galaxy
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1
-	Host: a.galaxy.far.far.away
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
+	Host: deathstar.another.galaxy
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1
+	Host: a.galaxy.far.far.away
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>

	</verify>

tests/data/test184+13 -13

@@ -57,19 +57,19 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
-	Host: another.visitor.stay.a.while.stay.foreeeeeever
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://yet.another.host/%TESTNUMBER HTTP/1.1
-	Host: yet.another.host
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
+	Host: another.visitor.stay.a.while.stay.foreeeeeever
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://yet.another.host/%TESTNUMBER HTTP/1.1
+	Host: yet.another.host
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>

	</verify>

tests/data/test185+13 -13

@@ -57,19 +57,19 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
-	Host: another.visitor.stay.a.while.stay.foreeeeeever
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://deathstar.another.galaxy/go/west/%TESTNUMBER HTTP/1.1
-	Host: another.visitor.stay.a.while.stay.foreeeeeever
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://deathstar.another.galaxy/%TESTNUMBER HTTP/1.1
+	Host: another.visitor.stay.a.while.stay.foreeeeeever
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://deathstar.another.galaxy/go/west/%TESTNUMBER HTTP/1.1
+	Host: another.visitor.stay.a.while.stay.foreeeeeever
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>

	</verify>

tests/data/test186+19 -19

@@ -41,25 +41,25 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=daniel;type=moo/foo-.4" -F
	<strip>
	^(Content-Type: multipart/form-data;\|------------).*
	</strip>
-	<protocol>
-	POST /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 341
-	Content-Type: multipart/form-data; boundary=----------------------------212d9006ceb5
-
-	------------------------------212d9006ceb5
-	Content-Disposition: form-data; name="name"
-	Content-Type: moo/foo-.4
-
-	daniel
-	------------------------------212d9006ceb5
-	Content-Disposition: form-data; name="html"
-	Content-Type: text/html;charset=verymoo
-
-	<body>hello</body>
-	------------------------------212d9006ceb5--
+	<protocol crlf="yes">
+	POST /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 341
+	Content-Type: multipart/form-data; boundary=----------------------------212d9006ceb5
+
+	------------------------------212d9006ceb5
+	Content-Disposition: form-data; name="name"
+	Content-Type: moo/foo-.4
+
+	daniel
+	------------------------------212d9006ceb5
+	Content-Disposition: form-data; name="html"
+	Content-Type: text/html;charset=verymoo
+
+	<body>hello</body>
+	------------------------------212d9006ceb5--
	</protocol>
	</verify>
	</testcase>

tests/data/test187+11 -11

@@ -60,17 +60,17 @@ http://%HOSTIP:%HTTPPORT?oh=what-weird=test/%TESTNUMBER -L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /?oh=what-weird=test/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /root/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /?oh=what-weird=test/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /root/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test188+13 -13

@@ -57,19 +57,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=50-
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=50-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=50-
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=50-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test189+13 -13

@@ -51,19 +51,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=50-
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=50-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=50-
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=50-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# 33 is CURLE_RANGE_ERROR
	<errorcode>

tests/data/test190+5 -5

@@ -37,11 +37,11 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/%TESTNUMBER -m 10
	<errorcode>
	28
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
	</protocol>
	</verify>
	</testcase>

tests/data/test1904+6 -6

@@ -68,12 +68,12 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1905+5 -5

@@ -42,11 +42,11 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
	# Netscape HTTP Cookie File

tests/data/test1906+5 -5

@@ -39,11 +39,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1907+5 -5

@@ -37,11 +37,11 @@ lib%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<stdout>
	Effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER

tests/data/test1908+9 -9

@@ -57,15 +57,15 @@ lib%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<stripfile>
	# strip out the (dynamic) expire date from the file so that the rest

tests/data/test1909+11 -11

@@ -43,17 +43,17 @@ HTTP GET --retry-all-errors to overcome partial transfer
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER">

tests/data/test191+9 -9

@@ -27,15 +27,15 @@ FTP URL with ?-letters in username and password

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER use?r
-	PASS pass?word
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER use?r
+	PASS pass?word
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test1910+11 -11

@@ -49,17 +49,17 @@ lib%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user%0aname:pass%0aword]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user%0aname:pass%0aword]b64%
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user%0aname:pass%0aword]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user%0aname:pass%0aword]b64%
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1919+11 -11

@@ -35,17 +35,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Bearer c4e448d652a961fda0ab64f882c8c161d5985f805d45d80c9ddca1
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Bearer c4e448d652a961fda0ab64f882c8c161d5985f805d45d80c9ddca1
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Bearer c4e448d652a961fda0ab64f882c8c161d5985f805d45d80c9ddca1
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Bearer c4e448d652a961fda0ab64f882c8c161d5985f805d45d80c9ddca1
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test192+6 -6

@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test193+11 -11

@@ -48,17 +48,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test1933+6 -6

@@ -59,12 +59,12 @@ http://xxx:[email protected]:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%H
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /%TESTNUMBER/testapi/test HTTP/1.1
-	Host: 127.0.0.1:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=3d8e00a02e437211a596143dcd590fcc805b731365c68f7f48951ea6eda39c4f
-	X-Xxx-Date: 19700101T000000Z
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER/testapi/test HTTP/1.1
+	Host: 127.0.0.1:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=3d8e00a02e437211a596143dcd590fcc805b731365c68f7f48951ea6eda39c4f
+	X-Xxx-Date: 19700101T000000Z
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1934+6 -6

@@ -59,12 +59,12 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /%TESTNUMBER/testapi/test HTTP/1.1
-	Host: 127.0.0.1:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=cf8dc9a4af903a1a9bb1385d8e2366d780afb501e266436598438395e502d58c
-	X-Yyy-Date: 19700101T000000Z
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER/testapi/test HTTP/1.1
+	Host: 127.0.0.1:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=cf8dc9a4af903a1a9bb1385d8e2366d780afb501e266436598438395e502d58c
+	X-Yyy-Date: 19700101T000000Z
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1935+6 -6

@@ -59,12 +59,12 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /%TESTNUMBER/testapi/test HTTP/1.1
-	Host: 127.0.0.1:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=a0b11b97b54689428d4188b788ed32865d607822d85d3e91cf06141f479dac0b
-	X-Yyy-Date: 19700101T000000Z
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER/testapi/test HTTP/1.1
+	Host: 127.0.0.1:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/127/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=a0b11b97b54689428d4188b788ed32865d607822d85d3e91cf06141f479dac0b
+	X-Yyy-Date: 19700101T000000Z
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1936+6 -6

@@ -59,12 +59,12 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /%TESTNUMBER/testapi/test HTTP/1.1
-	Host: 127.0.0.1:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/sss/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=026b713d76b0789bd224c5e41322f74eed088f8a22fd15183ca68376c575c5b0
-	X-Yyy-Date: 19700101T000000Z
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER/testapi/test HTTP/1.1
+	Host: 127.0.0.1:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/rrr/sss/xxx4_request, SignedHeaders=content-type;host;x-yyy-date, Signature=026b713d76b0789bd224c5e41322f74eed088f8a22fd15183ca68376c575c5b0
+	X-Yyy-Date: 19700101T000000Z
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1937+7 -7

@@ -60,13 +60,13 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER/testapi/test HTTP/1.1
-	Host: 127.0.0.1:9000
-	Authorization: PROVIDER14-HMAC-SHA256 Credential=keyId/19700101/region/service/provider14_request, SignedHeaders=content-type;host;x-provider2-date, Signature=4928ccf97a9e71fe27f91db5a3b3c943b6080d25e6f4df8593d4c38e7d1e849b
-	X-Provider2-Date: 19700101T000000Z
-	Content-Length: 8
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER/testapi/test HTTP/1.1
+	Host: 127.0.0.1:9000
+	Authorization: PROVIDER14-HMAC-SHA256 Credential=keyId/19700101/region/service/provider14_request, SignedHeaders=content-type;host;x-provider2-date, Signature=4928ccf97a9e71fe27f91db5a3b3c943b6080d25e6f4df8593d4c38e7d1e849b
+	X-Provider2-Date: 19700101T000000Z
+	Content-Length: 8
+
	postData
	</protocol>
	</verify>

tests/data/test195+3 -3

@@ -30,9 +30,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<errorcode>
	67
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
	</protocol>
	</verify>
	</testcase>

tests/data/test1955+10 -10

@@ -59,16 +59,16 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;tesmixcase;test2;test3;test_space;x-xxx-date, Signature=dd39202e9fb7b836ebf2abb83b114cae11ff3b6a169f0c64b290a774a873db9d
-	X-Xxx-Date: 19700101T000000Z
-	test3: 1234
-	test2:
-	test_space: t s m end
-	tesMixCase: MixCase
-
+	<protocol crlf="yes">
+	GET /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;tesmixcase;test2;test3;test_space;x-xxx-date, Signature=dd39202e9fb7b836ebf2abb83b114cae11ff3b6a169f0c64b290a774a873db9d
+	X-Xxx-Date: 19700101T000000Z
+	test3: 1234
+	test2:
+	test_space: t s m end
+	tesMixCase: MixCase
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1956+7 -7

@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=dfe78c8846a9b7d65d1eb4c1d6ea7bc886650d03f3568088cb8d5b4c3778287f
-	X-Xxx-Date: 19700101T000000Z
-	X-Xxx-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-
+	<protocol crlf="yes">
+	GET /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=dfe78c8846a9b7d65d1eb4c1d6ea7bc886650d03f3568088cb8d5b4c3778287f
+	X-Xxx-Date: 19700101T000000Z
+	X-Xxx-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1957+7 -7

@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=25b4cac711ea8f65010c485d3778885f5f3870d0b8ff0b3ab58a8d7eeab991ff
-	X-Xxx-Date: 19700101T000000Z
-	X-Xxx-Content-Sha256: arbitrary
-
+	<protocol crlf="yes">
+	GET /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=25b4cac711ea8f65010c485d3778885f5f3870d0b8ff0b3ab58a8d7eeab991ff
+	X-Xxx-Date: 19700101T000000Z
+	X-Xxx-Content-Sha256: arbitrary
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1958+7 -7

@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=25b4cac711ea8f65010c485d3778885f5f3870d0b8ff0b3ab58a8d7eeab991ff
-	X-Xxx-Date: 19700101T000000Z
-	X-Xxx-Content-Sha256: arbitrary
-
+	<protocol crlf="yes">
+	GET /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=25b4cac711ea8f65010c485d3778885f5f3870d0b8ff0b3ab58a8d7eeab991ff
+	X-Xxx-Date: 19700101T000000Z
+	X-Xxx-Content-Sha256: arbitrary
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1959+7 -7

@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=7b343a4aa55d73ffc05005d84480bc705a3367373ed8cae1a1c0fbd2b3aa0483
-	X-Xxx-Date: 19700101T000000Z
-	X-Xxx-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-
+	<protocol crlf="yes">
+	GET /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/ple/exam/xxx4_request, SignedHeaders=content-type;host;x-xxx-content-sha256;x-xxx-date, Signature=7b343a4aa55d73ffc05005d84480bc705a3367373ed8cae1a1c0fbd2b3aa0483
+	X-Xxx-Date: 19700101T000000Z
+	X-Xxx-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+
	</protocol>
	</verify>
	</testcase>

tests/data/test196+5 -5

@@ -32,11 +32,11 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --retry 1 -w '%{num_retries}\n'
	<errorcode>
	67
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	USER anonymous
-	PASS [email protected]
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	USER anonymous
+	PASS [email protected]
	</protocol>
	<stdout>
	1

tests/data/test1964+6 -6

@@ -58,12 +58,12 @@ http://xxx:[email protected]:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%H
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /%TESTNUMBER/testapi/test HTTP/1.1
-	Host: 127.0.0.1:9000
-	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=35da102c1df68f2ef85ade08ecc212fa663a66e3a973146f6578a5c5426e9669
-	X-Xxx-Date: 19700101T000000Z
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER/testapi/test HTTP/1.1
+	Host: 127.0.0.1:9000
+	Authorization: XXX4-HMAC-SHA256 Credential=xxx/19700101/0/127/xxx4_request, SignedHeaders=content-type;host;x-xxx-date, Signature=35da102c1df68f2ef85ade08ecc212fa663a66e3a973146f6578a5c5426e9669
+	X-Xxx-Date: 19700101T000000Z
+
	</protocol>
	</verify>
	</testcase>

tests/data/test197+11 -11

@@ -44,17 +44,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test1970+8 -8

@@ -59,14 +59,14 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	PUT /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=a028756f42a859122e9609c1f90cae4b272d6b03bf60d9fd354138176dfa2260
-	X-Amz-Date: 19700101T000000Z
-	x-amz-content-sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-	Content-Length: 0
-
+	<protocol crlf="yes">
+	PUT /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=a028756f42a859122e9609c1f90cae4b272d6b03bf60d9fd354138176dfa2260
+	X-Amz-Date: 19700101T000000Z
+	x-amz-content-sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+	Content-Length: 0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1971+11 -11

@@ -52,17 +52,17 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	PUT /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=4a6e9b4af0542ffb83744c6852f8e1bfec14f2a67e6f6f037b39f172f79d62af
-	X-Amz-Date: 19700101T000000Z
-	x-amz-content-sha256: UNSIGNED-PAYLOAD
-	Transfer-Encoding: chunked
-	Expect: 100-continue
-
-	0
-
+	<protocol crlf="yes">
+	PUT /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=4a6e9b4af0542ffb83744c6852f8e1bfec14f2a67e6f6f037b39f172f79d62af
+	X-Amz-Date: 19700101T000000Z
+	x-amz-content-sha256: UNSIGNED-PAYLOAD
+	Transfer-Encoding: chunked
+	Expect: 100-continue
+
+	0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1972+13 -13

@@ -62,19 +62,19 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	POST /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=eaee0f1c5984ad5d81c8bc7805f28c7b83b35322de654b2ace18cb8cf6d5a9cb
-	X-Amz-Date: 19700101T000000Z
-	x-amz-content-sha256: UNSIGNED-PAYLOAD
-	Content-Length: 154
-
-	--------------------------qrstuvwxyz0123456789AB
-	Content-Disposition: attachment; name="foo"
-
-	bar
-	--------------------------qrstuvwxyz0123456789AB--
+	<protocol crlf="yes">
+	POST /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=eaee0f1c5984ad5d81c8bc7805f28c7b83b35322de654b2ace18cb8cf6d5a9cb
+	X-Amz-Date: 19700101T000000Z
+	x-amz-content-sha256: UNSIGNED-PAYLOAD
+	Content-Length: 154
+
+	--------------------------qrstuvwxyz0123456789AB
+	Content-Disposition: attachment; name="foo"
+
+	bar
+	--------------------------qrstuvwxyz0123456789AB--
	</protocol>
	</verify>
	</testcase>

tests/data/test1974+7 -7

@@ -59,13 +59,13 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	GET /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=e6270423932feafe9b00ca5d60c9ed566be649f9ca9676144288273945153021
-	X-Amz-Date: 19700101T000000Z
-	x-amz-content-sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-
+	<protocol crlf="yes">
+	GET /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=e6270423932feafe9b00ca5d60c9ed566be649f9ca9676144288273945153021
+	X-Amz-Date: 19700101T000000Z
+	x-amz-content-sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1975+11 -11

@@ -52,17 +52,17 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol>
-	PUT /aws_sigv4/testapi/test HTTP/1.1
-	Host: exam.ple.com:9000
-	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=a028756f42a859122e9609c1f90cae4b272d6b03bf60d9fd354138176dfa2260
-	X-Amz-Date: 19700101T000000Z
-	Transfer-Encoding: chunked
-	X-Amz-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
-	Expect: 100-continue
-
-	0
-
+	<protocol crlf="yes">
+	PUT /aws_sigv4/testapi/test HTTP/1.1
+	Host: exam.ple.com:9000
+	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=content-type;host;x-amz-content-sha256;x-amz-date, Signature=a028756f42a859122e9609c1f90cae4b272d6b03bf60d9fd354138176dfa2260
+	X-Amz-Date: 19700101T000000Z
+	Transfer-Encoding: chunked
+	X-Amz-Content-Sha256: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+	Expect: 100-continue
+
+	0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test1977+13 -13

@@ -44,19 +44,19 @@ effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER?foo
	effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER?foo&bar
	</stdout>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER?foo HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER?foo&bar HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER?foo HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER?foo&bar HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test198+11 -11

@@ -53,17 +53,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 1000
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test199+11 -11

@@ -42,17 +42,17 @@ HTTP with -d, -G and {}
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2+7 -7

@@ -36,13 +36,13 @@ HTTP GET with user and password
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[fake:user]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[fake:user]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2005+7 -7

@@ -43,13 +43,13 @@ machine example.com
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET / HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[:5up3r53cr37]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET / HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[:5up3r53cr37]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2023+26 -26

@@ -119,32 +119,32 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic basic

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:wrongpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:wrongpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:wrongpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:wrongpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:wrongpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:wrongpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2024+26 -26

@@ -134,32 +134,32 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:wrongpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0200", response="ed646c565f79e2dd9fa37cb5a621213c"
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:wrongpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0400", response="9741ced8caacc6124770187b36f007c5"
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0500", response="5bc77ec8c2d443b27a1b55f1fd8fbb13"
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:wrongpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0200", response="ed646c565f79e2dd9fa37cb5a621213c"
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:wrongpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0400", response="9741ced8caacc6124770187b36f007c5"
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0500", response="5bc77ec8c2d443b27a1b55f1fd8fbb13"
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2025+41 -41

@@ -216,47 +216,47 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic ntlm

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:wrongpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:wrongpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:wrongpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:wrongpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2026+34 -34

@@ -170,40 +170,40 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest basic

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="5f992a2e761ab926256419f7c685f85b"
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0300", response="132242e602882251929be93228c830ae"
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:wrongpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="5f992a2e761ab926256419f7c685f85b"
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="3", uri="/%TESTNUMBER0300", response="132242e602882251929be93228c830ae"
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:wrongpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2027+39 -39

@@ -193,45 +193,45 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="f7fd60eefaff5225971bf9b3d80d6ba6"
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="785ca3ef511999f7e9c178195f5b388c"
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="4c735d2360fd6848e7cb32a11ae3612b"
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="8ef4d935fd964a46c3965c0863b52cf1"
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="f7fd60eefaff5225971bf9b3d80d6ba6"
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="785ca3ef511999f7e9c178195f5b388c"
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="4c735d2360fd6848e7cb32a11ae3612b"
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="f5906785511fb60a2af8b1cd53008ead"
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="8ef4d935fd964a46c3965c0863b52cf1"
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2028+49 -49

@@ -253,55 +253,55 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest ntlm

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="53c80666f5e3a4a55f92a66aaf0078bb"
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="1aa5d90da9803ca12d04b24e0f19476e"
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER0100", response="53c80666f5e3a4a55f92a66aaf0078bb"
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="4", uri="/%TESTNUMBER0300", response="1aa5d90da9803ca12d04b24e0f19476e"
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2029+36 -36

@@ -189,42 +189,42 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm basic

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:wrongpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:wrongpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2030+41 -41

@@ -242,47 +242,47 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="2f2d784ba53a0a307758a90e98d25c27"
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="198757e61163a779cf24ed4c49c1ad7d"
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="2", uri="/%TESTNUMBER0200", response="2f2d784ba53a0a307758a90e98d25c27"
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="5", uri="/%TESTNUMBER0400", response="d6262e9147db08c62ff2f53b515861e8"
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="7", uri="/%TESTNUMBER0500", response="198757e61163a779cf24ed4c49c1ad7d"
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2031+51 -51

@@ -255,57 +255,57 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm ntlm

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0300 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0400 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0500 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0300 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0400 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABANgKEcT5xUUBHw5+0m4FjWTGNzg6PeHJHbaPwNwCt/tXcnIeTQCTMAg12SPDyNXMf3Rlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0500 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2032+21 -21

@@ -88,27 +88,27 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoABAI+/Fp9IERAQ74OsdNPbBpg7o8CVwLSO4DtFyIcZHUMKVktWIu92s2892OVpd2JzqnRlc3R1c2VyV09SS1NUQVRJT04=
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2033+6 -6

@@ -47,12 +47,12 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2034+6 -6

@@ -43,12 +43,12 @@ simple HTTPS GET with DER public key pinning
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2037+6 -6

@@ -43,12 +43,12 @@ simple HTTPS GET with PEM public key pinning
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2039+8 -8

@@ -48,14 +48,14 @@ machine %HOSTIP login user2 password passwd2
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER userdef
-	PASS passwddef
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER userdef
+	PASS passwddef
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test2040+12 -12

@@ -47,18 +47,18 @@ HTTP Basic authorization, then without authorization

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0100 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[testuser:testpass]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0200 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0100 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[testuser:testpass]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0200 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	Finally, this is the real page!

tests/data/test2041+6 -6

@@ -43,12 +43,12 @@ simple HTTPS GET with base64-sha256 public key pinning
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2046+11 -11

@@ -57,17 +57,17 @@ http://%hex[%c3%a5%c3%a4%c3%b6]hex%.se:%HTTPPORT/%TESTNUMBER --resolve xn--4cab6
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: xn--4cab6c.se:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: xn--4cab6c.se:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: xn--4cab6c.se:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: xn--4cab6c.se:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test2047+13 -13

@@ -58,19 +58,19 @@ http://%hex[%c3%a5%c3%a4%c3%b6]hex%.se/%TESTNUMBER -x %HOSTIP:%HTTPPORT -w "%{nu
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://xn--4cab6c.se/%TESTNUMBER HTTP/1.1
-	Host: xn--4cab6c.se
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://xn--4cab6c.se/%TESTNUMBER0001 HTTP/1.1
-	Host: xn--4cab6c.se
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://xn--4cab6c.se/%TESTNUMBER HTTP/1.1
+	Host: xn--4cab6c.se
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://xn--4cab6c.se/%TESTNUMBER0001 HTTP/1.1
+	Host: xn--4cab6c.se
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>

	<stdout>

tests/data/test2049+21 -21

@@ -38,27 +38,27 @@ http://www1.example.com:8081/%TESTNUMBER --connect-to ::%HOSTIP:%HTTPPORT --next
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www1.example.com:8081
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www2.example.com:8082
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www3.example.com:8083
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www4.example.com:8084
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www1.example.com:8081
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www2.example.com:8082
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www3.example.com:8083
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www4.example.com:8084
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test2050+6 -6

@@ -68,12 +68,12 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www.example.com.%TESTNUMBER
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www.example.com.%TESTNUMBER
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test2051+16 -16

@@ -38,22 +38,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next --connect-to
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test2052+11 -11

@@ -39,17 +39,17 @@ http://www.example.com:%HTTPPORT/%TESTNUMBER --resolve www.example.com:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www.example.com:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www.example.com:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www.example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www.example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout>

tests/data/test2053+11 -11

@@ -38,17 +38,17 @@ http://10.0.0.1:8081/%TESTNUMBER --connect-to 10.0.0.1:8081:%HOSTIP:%HTTPPORT --
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: 10.0.0.1:8081
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: [fc00::1]:8082
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: 10.0.0.1:8081
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: [fc00::1]:8082
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test2054+21 -21

@@ -38,27 +38,27 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --connect-to foo::bar: --connect-to :123::4
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www.example.com:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:8083
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www.example.com:8084
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www.example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:8083
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www.example.com:8084
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test2055+6 -6

@@ -69,12 +69,12 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: www.example.com.%TESTNUMBER
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: www.example.com.%TESTNUMBER
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test2056+7 -7

@@ -51,13 +51,13 @@ CURL_STUB_GSS_CREDS="KRB5_Alice"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Negotiate %b64["KRB5_Alice":[email protected]:1:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Negotiate %b64["KRB5_Alice":[email protected]:1:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2057+13 -13

@@ -67,19 +67,19 @@ CURL_STUB_GSS_CREDS="NTLM_Alice"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Negotiate %b64["NTLM_Alice":[email protected]:2:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Negotiate %b64["NTLM_Alice":[email protected]:3:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Negotiate %b64["NTLM_Alice":[email protected]:2:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Negotiate %b64["NTLM_Alice":[email protected]:3:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2061+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9dc55255f1a2537b838311674b621d45346b862a81631bb20e4ce356ef25062d", algorithm=SHA-256
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2062+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9d3256ee6526ec40dd48743bb48e51ee9baba587c78f15c3a86166242150af98", algorithm=SHA-512-256
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="9d3256ee6526ec40dd48743bb48e51ee9baba587c78f15c3a86166242150af98", algorithm=SHA-512-256
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2063+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="6c470aec384ab1d4e12d3ce1f5b08303d8cad177e52ebe50ec1a3e141adb0cdc", algorithm=SHA-256, userhash=true
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="6c470aec384ab1d4e12d3ce1f5b08303d8cad177e52ebe50ec1a3e141adb0cdc", algorithm=SHA-256, userhash=true
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2064+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="a9c3ec1036068b336cbabefe9dfcad52ee8b89bc7c91ddbb5bb415c6acdf38a5", algorithm=SHA-256
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2065+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="0373a49d7d352ff54884faaf762fc6c89281b4112ad8fcbbe1d1ee52dcf7a802", algorithm=SHA-512-256
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="0373a49d7d352ff54884faaf762fc6c89281b4112ad8fcbbe1d1ee52dcf7a802", algorithm=SHA-512-256
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2066+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="374a35326cc09e7d1ec3165aee9de01cae46daac33d8999aa1f483fa7882b86c", algorithm=SHA-256, userhash=true
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="75af8a3500f771e58a52093a25e7905d6e428a511285c12ea1420c73078dfd61", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="374a35326cc09e7d1ec3165aee9de01cae46daac33d8999aa1f483fa7882b86c", algorithm=SHA-256, userhash=true
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2067+16 -16

@@ -67,22 +67,22 @@ HTTP POST --digest with SHA256 and user-specified Content-Length header

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="67b97af219c92fa7e8685e5bebb8e74892f6c6792e911c52bd2dfbf0b49272eb", algorithm=SHA-256
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	junkelijunk
	</protocol>
	</verify>

tests/data/test2068+16 -16

@@ -67,22 +67,22 @@ HTTP POST Digest with SHA-512-256, userhash and set Content-Length

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="0ba2f7ec8045446588eea82bb0c3812aedb05f4eac8883ea65040a52e9c5629e", algorithm=SHA-512-256
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="0ba2f7ec8045446588eea82bb0c3812aedb05f4eac8883ea65040a52e9c5629e", algorithm=SHA-512-256
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	junkelijunk
	</protocol>
	</verify>

tests/data/test2069+16 -16

@@ -67,22 +67,22 @@ HTTP POST Digest with SHA-256, userhash and set Content-Length header

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="9a29f1dab407e62daa7121185f9f12db6177415e03f35d9a881550095a83378d", algorithm=SHA-256, userhash=true
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="fddc3bc7b753b73ab0848fd83cb20cbbca971258eb8d20c941dd5e0b010d66be", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="9a29f1dab407e62daa7121185f9f12db6177415e03f35d9a881550095a83378d", algorithm=SHA-256, userhash=true
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	junkelijunk
	</protocol>
	</verify>

tests/data/test207+6 -6

@@ -48,12 +48,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# curl: (18) transfer closed with outstanding read data remaining

tests/data/test2070+6 -6

@@ -46,12 +46,12 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2073+21 -21

@@ -47,27 +47,27 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -F 'name=a;filename=a.pdf' --next http://%H
	<strip>
	^(Content-Type: multipart/form-data;\|------------).*
	</strip>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 201
-
-	Content-Disposition: form-data; name="name"; filename="a.pdf"
-	Content-Type: application/pdf
-
-	a
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 196
-
-	Content-Disposition: form-data; name="name"; filename="b.jpg"
-	Content-Type: image/jpeg
-
-	b
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 201
+
+	Content-Disposition: form-data; name="name"; filename="a.pdf"
+	Content-Type: application/pdf
+
+	a
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 196
+
+	Content-Disposition: form-data; name="name"; filename="b.jpg"
+	Content-Type: image/jpeg
+
+	b
	</protocol>
	</verify>
	</testcase>

tests/data/test2074+7 -7

@@ -43,13 +43,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --oauth2-bearer mF_9.B5f-4.1JqM
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Bearer mF_9.B5f-4.1JqM
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Bearer mF_9.B5f-4.1JqM
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2076+12 -12

@@ -58,18 +58,18 @@ HTTP with digest auth and URI contains query

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER?query HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER?query HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER?query", response="5758bd3bbde7f33236e6ccd278eb59af"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER?query HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER?query HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1", uri="/%TESTNUMBER?query", response="5758bd3bbde7f33236e6ccd278eb59af"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2078+8 -8

@@ -38,14 +38,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --negotiate --data name=value
	<errorcode>
	0
	</errorcode>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 10
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 10
+	Content-Type: application/x-www-form-urlencoded
+
	name=value
	</protocol>
	</verify>

tests/data/test2079+6 -6

@@ -47,12 +47,12 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2081+14 -14

@@ -42,20 +42,20 @@ http://user:pass@%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER#anchor --location --r

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/our/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:pass]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:pass]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER
-
+	<protocol crlf="yes">
+	GET /we/want/our/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:pass]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:pass]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER
+
	</protocol>
	<stdout>
	HTTP/1.1 301 This is a weirdo text message swsclose

tests/data/test2087+6 -6

@@ -47,12 +47,12 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2088+6 -6

@@ -42,12 +42,12 @@ HTTPS GET with client authentication (mtls)
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPS-MTLSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPS-MTLSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2089+6 -6

@@ -42,12 +42,12 @@ HTTPS GET with client authentication (mtls) and --insecure
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPS-MTLSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPS-MTLSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test209+18 -18

@@ -92,24 +92,24 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	GET /path/%TESTNUMBER0002 HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	GET /path/%TESTNUMBER0002 HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test210+14 -14

@@ -33,20 +33,20 @@ data blobb

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD a
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD a
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test2100+41 -41

@@ -69,49 +69,49 @@ http://foo.example.com:%HTTPPORT/%TESTNUMBER --doh-url http://%HOSTIP:%HTTPPORT/
	<strippart>
	s/com\x00\x00(\x1c\|\x01)/com-00-00!/g;
	</strippart>
-	<protocol>
+	<protocol crlf="yes">
	%if HTTPSRR
-	POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Type: application/dns-message
-	Content-Length: 33
-
-	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Type: application/dns-message
-	Content-Length: 33
-
-	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Type: application/dns-message
-	Content-Length: 47
-
-	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%06_%HTTPPORT%06_https%03foo%07example%03com%00%00A%00%01]hex%GET /%TESTNUMBER HTTP/1.1
-	Host: foo.example.com:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Type: application/dns-message
+	Content-Length: 33
+
+	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Type: application/dns-message
+	Content-Length: 33
+
+	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Type: application/dns-message
+	Content-Length: 47
+
+	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%06_%HTTPPORT%06_https%03foo%07example%03com%00%00A%00%01]hex%GET /%TESTNUMBER HTTP/1.1
+	Host: foo.example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	%else
-	POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Type: application/dns-message
-	Content-Length: 33
-
-	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Type: application/dns-message
-	Content-Length: 33
-
-	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%GET /%TESTNUMBER HTTP/1.1
-	Host: foo.example.com:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Type: application/dns-message
+	Content-Length: 33
+
+	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Type: application/dns-message
+	Content-Length: 33
+
+	%hex[%00%00%01%00%00%01%00%00%00%00%00%00%03foo%07example%03com-00-00!%00%01]hex%GET /%TESTNUMBER HTTP/1.1
+	Host: foo.example.com:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	%endif
	</protocol>
	</verify>

tests/data/test211+15 -15

@@ -34,21 +34,21 @@ data blobb

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD a
-	CWD path
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	PASV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD a
+	CWD path
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	PASV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test213+20 -20

@@ -92,26 +92,26 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	POST /path/%TESTNUMBER0002 HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 6
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.0
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	POST /path/%TESTNUMBER0002 HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 6
+	Content-Type: application/x-www-form-urlencoded
+
	postit
	</protocol>
	</verify>

tests/data/test214+6 -6

@@ -40,12 +40,12 @@ MSYS2_ARG_CONV_EXCL=http://
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /{}\/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /{}\/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test215+13 -13

@@ -38,19 +38,19 @@ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ ftp://%HOSTIP:%FTPPORT/a/path/%TESTNU

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD a
-	CWD path
-	CWD %TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	EPSV
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD a
+	CWD path
+	CWD %TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	EPSV
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test216+13 -13

@@ -27,19 +27,19 @@ upload this file twice

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD a
-	CWD path
-	CWD %TESTNUMBER
-	EPSV
-	TYPE I
-	STOR upload.%TESTNUMBER
-	EPSV
-	STOR ..anotherup.%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD a
+	CWD path
+	CWD %TESTNUMBER
+	EPSV
+	TYPE I
+	STOR upload.%TESTNUMBER
+	EPSV
+	STOR ..anotherup.%TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test217+6 -6

@@ -41,12 +41,12 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	# CURLE_RECV_ERROR
	<errorcode>

tests/data/test22+6 -6

@@ -31,12 +31,12 @@ get HTTP with URL > 10000 bytes

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%repeat[11000 x a]%/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%repeat[11000 x a]%/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test220+7 -7

@@ -61,13 +61,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	</verify>
	</testcase>

tests/data/test221+7 -7

@@ -61,13 +61,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	<errorcode>
	61

tests/data/test222+7 -7

@@ -172,13 +172,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	</verify>
	</testcase>

tests/data/test223+7 -7

@@ -60,13 +60,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	<errorcode>
	61

tests/data/test224+7 -7

@@ -58,13 +58,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	</verify>
	</testcase>

tests/data/test227+15 -15

@@ -37,21 +37,21 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FA

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	NOOP 1
-	FAIL
-	EPSV
-	PASV
-	TYPE I
-	NOOP 2
-	FAIL HARD
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	NOOP 3
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	NOOP 1
+	FAIL
+	EPSV
+	PASV
+	TYPE I
+	NOOP 2
+	FAIL HARD
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	NOOP 3
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test228+10 -10

@@ -37,16 +37,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	ACCT one count
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	ACCT one count
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test229+4 -4

@@ -29,10 +29,10 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	ACCT one count
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	ACCT one count
	</protocol>
	<errorcode>
	11

tests/data/test230+7 -7

@@ -172,13 +172,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2300+10 -10

@@ -47,16 +47,16 @@ WebSockets upgrade only
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nocheck="yes">
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Upgrade: websocket
-	Sec-WebSocket-Version: 13
-	Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
-	Connection: Upgrade
-
+	<protocol crlf="yes" nocheck="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Upgrade: websocket
+	Sec-WebSocket-Version: 13
+	Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
+	Connection: Upgrade
+
	</protocol>
	<errorcode>
	52

tests/data/test2301+10 -10

@@ -52,16 +52,16 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nocheck="yes" nonewline="yes">
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: webbie-sox/3
-	Accept: /
-	Upgrade: websocket
-	Sec-WebSocket-Version: 13
-	Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
-	Connection: Upgrade
-
+	<protocol crlf="yes" nonewline="yes" nocheck="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: webbie-sox/3
+	Accept: /
+	Upgrade: websocket
+	Sec-WebSocket-Version: 13
+	Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
+	Connection: Upgrade
+
	%hex[%8a%00]hex%
	</protocol>
	</verify>

tests/data/test2302+10 -10

@@ -53,16 +53,16 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	# PONG with no data and the 32 bit mask
	#
	<verify>
-	<protocol nocheck="yes" nonewline="yes">
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: webbie-sox/3
-	Accept: /
-	Upgrade: websocket
-	Sec-WebSocket-Version: 13
-	Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
-	Connection: Upgrade
-
+	<protocol crlf="yes" nonewline="yes" nocheck="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: webbie-sox/3
+	Accept: /
+	Upgrade: websocket
+	Sec-WebSocket-Version: 13
+	Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
+	Connection: Upgrade
+
	%hex[%8a%808321]hex%
	</protocol>
	<stdout mode="text">

tests/data/test2303+10 -10

@@ -43,16 +43,16 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: webbie-sox/3
-	Accept: /
-	Upgrade: websocket
-	Sec-WebSocket-Version: 13
-	Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
-	Connection: Upgrade
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: webbie-sox/3
+	Accept: /
+	Upgrade: websocket
+	Sec-WebSocket-Version: 13
+	Sec-WebSocket-Key: NDMyMTUzMjE2MzIxNzMyMQ==
+	Connection: Upgrade
+
	</protocol>
	# 22 == CURLE_HTTP_RETURNED_ERROR
	<errorcode>

tests/data/test2304+1 -1

@@ -52,7 +52,7 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	# PONG with no data and the 32 bit mask
	#
	<verify>
-	<protocol nocheck="yes" crlf="yes">
+	<protocol crlf="yes" nocheck="yes">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: websocket/%TESTNUMBER

tests/data/test2306+9 -9

@@ -54,15 +54,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2308+5 -5

@@ -44,11 +44,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<stdout mode="text">
	Returned 23, should be 23.

tests/data/test2309+7 -7

@@ -54,13 +54,13 @@ password $y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPu
	</client>

	<verify>
-	<protocol>
-	GET http://github.com/ HTTP/1.1
-	Host: github.com
-	Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64%
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://github.com/ HTTP/1.1
+	Host: github.com
+	Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64%
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test232+7 -7

@@ -172,13 +172,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	</verify>
	</testcase>

tests/data/test233+16 -16

@@ -75,22 +75,22 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: first.host.it.is
-	Proxy-Authorization: Basic %b64[testing:this]b64%
-	Authorization: Basic %b64[iam:myself]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
-	Host: goto.second.host.now
-	Proxy-Authorization: Basic %b64[testing:this]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: first.host.it.is
+	Proxy-Authorization: Basic %b64[testing:this]b64%
+	Authorization: Basic %b64[iam:myself]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
+	Host: goto.second.host.now
+	Proxy-Authorization: Basic %b64[testing:this]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test234+17 -17

@@ -77,23 +77,23 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: first.host.it.is
-	Proxy-Authorization: Basic %b64[testing:this]b64%
-	Authorization: Basic %b64[iam:myself]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
-	Host: goto.second.host.now
-	Proxy-Authorization: Basic %b64[testing:this]b64%
-	Authorization: Basic %b64[iam:myself]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: first.host.it.is
+	Proxy-Authorization: Basic %b64[testing:this]b64%
+	Authorization: Basic %b64[iam:myself]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
+	Host: goto.second.host.now
+	Proxy-Authorization: Basic %b64[testing:this]b64%
+	Authorization: Basic %b64[iam:myself]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test235+9 -9

@@ -33,15 +33,15 @@ worx?

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	<upload>
	this is the ***crap****** that we're gonna upload

tests/data/test236+9 -9

@@ -34,15 +34,15 @@ Test data
	# Verify data after the test has been "shot"
	<verify>

-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	STOR %TESTNUMBER
+	QUIT
	</protocol>

	# (25) Failed FTP upload: 550

tests/data/test237+5 -5

@@ -34,11 +34,11 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --disable-epsv
	<errorcode>
	14
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	PASV
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	PASV
	</protocol>
	</verify>
	</testcase>

tests/data/test238+6 -6

@@ -31,12 +31,12 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<errorcode>
	13
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test239+19 -19

@@ -67,25 +67,25 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-us

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Content-Length: 6
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Content-Length: 6
+	Content-Type: application/x-www-form-urlencoded
+
	postit
	</protocol>
	</verify>

tests/data/test24+6 -6

@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail --silent --show-error

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	22

tests/data/test240+6 -6

@@ -45,12 +45,12 @@ HTTP-IPv6 GET
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test2401+10 -10

@@ -55,16 +55,16 @@ server: nghttpx
	via: 1.1 nghttpx

	</stdout>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTP2TLSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-	X-Forwarded-Proto: https
-	Via: 2 nghttpx
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTP2TLSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+	X-Forwarded-Proto: https
+	Via: 2 nghttpx
+
	moo
	</protocol>
	</verify>

tests/data/test2404+23 -23

@@ -11,35 +11,35 @@ verbose logs
	# Server-side
	<reply>
	<data1 crlf="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: server.example.com
-	Content-Length: 47
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: server.example.com
+	Content-Length: 47
+
	file contents should appear once for each file
	</data1>
-	<data2>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: server.example.com
-	Content-Length: 47
-
+	<data2 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: server.example.com
+	Content-Length: 47
+
	file contents should appear once for each file
	</data2>
-	<data3>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: server.example.com
-	Content-Length: 47
-
+	<data3 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: server.example.com
+	Content-Length: 47
+
	file contents should appear once for each file
	</data3>
-	<data4>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: server.example.com
-	Content-Length: 47
-
+	<data4 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: server.example.com
+	Content-Length: 47
+
	file contents should appear once for each file
	</data4>
	</reply>

tests/data/test2405+0 -2

@@ -44,7 +44,5 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER

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

tests/data/test241+6 -6

@@ -43,12 +43,12 @@ HTTP-IPv6 GET (using ip6-localhost)
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: ip6-localhost:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: ip6-localhost:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test242+7 -7

@@ -40,13 +40,13 @@ HTTP-IPv6 GET with username+password in URL
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	Authorization: Basic %b64[foobar:barfoo]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	Authorization: Basic %b64[foobar:barfoo]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test243+27 -27

@@ -88,33 +88,33 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-us

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Content-Length: 6
-	Content-Type: application/x-www-form-urlencoded
-
-	postitPOST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Content-Length: 6
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Content-Length: 6
+	Content-Type: application/x-www-form-urlencoded
+
+	postitPOST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Content-Length: 6
+	Content-Type: application/x-www-form-urlencoded
+
	postit
	</protocol>
	</verify>

tests/data/test244+8 -8

@@ -41,14 +41,14 @@ FTP dir listing with nocwd and URL encoded path

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST fir#t/third/%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST fir#t/third/%TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test245+16 -16

@@ -64,22 +64,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="379a439b1737ba257c1d2f103914b18b"
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="379a439b1737ba257c1d2f103914b18b"
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	junkelijunk
	</protocol>
	</verify>

tests/data/test246+16 -16

@@ -74,22 +74,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -d "junkelijunk"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="761e6fc9a760c39d587092e8d840e740"
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="761e6fc9a760c39d587092e8d840e740"
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	junkelijunk
	</protocol>
	</verify>

tests/data/test247+6 -6

@@ -35,12 +35,12 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	MDTM %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	MDTM %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test248+9 -9

@@ -44,15 +44,15 @@ that FTP
	works
	so does it?
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	MDTM %TESTNUMBER
-	EPSV
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	MDTM %TESTNUMBER
+	EPSV
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test249+7 -7

@@ -40,13 +40,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
	</protocol>
	</verify>
	</testcase>

tests/data/test25+31 -31

@@ -73,37 +73,37 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 5

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/data/reply/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/data/reply/data/reply/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/data/reply/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/data/reply/data/reply/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/data/reply/data/reply/data/reply/data/reply/data/reply/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<errorcode>

tests/data/test250+8 -8

@@ -46,14 +46,14 @@ ftp://%HOSTIP:%FTPPORT/
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test2501+9 -9

@@ -54,15 +54,15 @@ funny-head: yesyes
	via: 1.1 nghttpx

	</stdout>
-	<protocol nonewline="yes">
-	POST https://%HOSTIP:%HTTP3PORT/2501 HTTP/1.1
-	Host: %HOSTIP:%HTTP3PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 3
-	Content-Type: application/x-www-form-urlencoded
-	Via: 3 nghttpx
-
+	<protocol crlf="yes" nonewline="yes">
+	POST https://%HOSTIP:%HTTP3PORT/2501 HTTP/1.1
+	Host: %HOSTIP:%HTTP3PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 3
+	Content-Type: application/x-www-form-urlencoded
+	Via: 3 nghttpx
+
	moo
	</protocol>
	</verify>

tests/data/test2502+23 -23

@@ -11,35 +11,35 @@ verbose logs
	# Server-side
	<reply>
	<data1 crlf="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: server.example.com
-	Content-Length: 47
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: server.example.com
+	Content-Length: 47
+
	file contents should appear once for each file
	</data1>
-	<data2>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: server.example.com
-	Content-Length: 47
-
+	<data2 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: server.example.com
+	Content-Length: 47
+
	file contents should appear once for each file
	</data2>
-	<data3>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: server.example.com
-	Content-Length: 47
-
+	<data3 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: server.example.com
+	Content-Length: 47
+
	file contents should appear once for each file
	</data3>
-	<data4>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: server.example.com
-	Content-Length: 47
-
+	<data4 crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: server.example.com
+	Content-Length: 47
+
	file contents should appear once for each file
	</data4>
	</reply>

tests/data/test251+8 -8

@@ -46,14 +46,14 @@ ftp://%HOSTIP:%FTPPORT/ -P %CLIENTIP
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	PORT 127,0,0,1,243,212
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	PORT 127,0,0,1,243,212
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test252+8 -8

@@ -45,14 +45,14 @@ FTP IPv6 dir list PASV
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test254+8 -8

@@ -46,14 +46,14 @@ FTP IPv6 dir list PASV and --disable-epsv
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test256+9 -9

@@ -45,15 +45,15 @@ proxy
	<errorcode>
	33
	</errorcode>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: Basic %b64[daniel:stenberg]b64%
-	Range: bytes=78-
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: Basic %b64[daniel:stenberg]b64%
+	Range: bytes=78-
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>

	# the download target file must remain untouched

tests/data/test257+21 -21

@@ -85,27 +85,27 @@ machine anotherone.com login user2 password passwd2

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://supersite.com/want/%TESTNUMBER HTTP/1.1
-	Host: supersite.com
-	Authorization: Basic %b64[user1:passwd1]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://anotherone.com/%TESTNUMBER0002 HTTP/1.1
-	Host: anotherone.com
-	Authorization: Basic %b64[user2:passwd2]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://athird.com/%TESTNUMBER0003 HTTP/1.1
-	Host: athird.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://supersite.com/want/%TESTNUMBER HTTP/1.1
+	Host: supersite.com
+	Authorization: Basic %b64[user1:passwd1]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://anotherone.com/%TESTNUMBER0002 HTTP/1.1
+	Host: anotherone.com
+	Authorization: Basic %b64[user2:passwd2]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://athird.com/%TESTNUMBER0003 HTTP/1.1
+	Host: athird.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test26+6 -6

@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -o - -o -

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test260+6 -6

@@ -42,12 +42,12 @@ HTTP GET URL without slash but with question mark
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /?%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /?%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test261+9 -9

@@ -34,15 +34,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test262+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	8

tests/data/test263+7 -7

@@ -41,13 +41,13 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://veryveryremotesite.com/%TESTNUMBER HTTP/1.1
-	Host: veryveryremotesite.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://veryveryremotesite.com/%TESTNUMBER HTTP/1.1
+	Host: veryveryremotesite.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test264+8 -8

@@ -37,14 +37,14 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
-	Host: we.want.that.site.com
-	Proxy-Authorization: Basic %b64[fake:user]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+	Host: we.want.that.site.com
+	Proxy-Authorization: Basic %b64[fake:user]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test265+20 -20

@@ -95,26 +95,26 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	POST /path/%TESTNUMBER0002 HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 6
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	POST /path/%TESTNUMBER0002 HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 6
+	Content-Type: application/x-www-form-urlencoded
+
	postit
	</protocol>
	</verify>

tests/data/test266+6 -6

@@ -60,12 +60,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/heads%TESTNUMBER">
	HTTP/1.1 200 funky chunky!

tests/data/test267+21 -21

@@ -73,27 +73,27 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -d "data" -H "H

	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Header1: yes
-	Header2: no
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Header1: yes
-	Header2: no
-	Content-Length: 4
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Header1: yes
+	Header2: no
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Header1: yes
+	Header2: no
+	Content-Length: 4
+	Content-Type: application/x-www-form-urlencoded
+
	data
	</protocol>
	</verify>

tests/data/test269+6 -6

@@ -40,12 +40,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --ignore-content-length
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test27+18 -18

@@ -36,24 +36,24 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: thewinneris=nowayyouwin
-
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: thewinneris=nowayyouwin
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: thewinneris=nowayyouwin
+
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: thewinneris=nowayyouwin
+
	</protocol>
	</verify>
	</testcase>

tests/data/test270+9 -9

@@ -36,15 +36,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-skip-pasv-ip --disable-epsv

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test273+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="576ae57b1db0039f8c0de43ef58e49e3"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="576ae57b1db0039f8c0de43ef58e49e3"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test274+6 -6

@@ -34,12 +34,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 0

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<errorcode>

tests/data/test276+11 -11

@@ -59,17 +59,17 @@ HTTP Location: following with multiple question marks in URLs

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want?uri=http://anything/%TESTNUMBER?secondq/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /data/%TESTNUMBER0002.txt?coolsite=http://anotherurl/?a_second/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test277+13 -13

@@ -40,19 +40,19 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -F name=daniel -H "Content-Type: text/
	s/^--------------------------[A-Za-z0-9]*/--------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=------------------------/
	</strippart>
-	<protocol>
-	POST /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 158
-	Content-Type: text/info; boundary=------------------------
-
-	--------------------------
-	Content-Disposition: attachment; name="name"
-
-	daniel
-	----------------------------
+	<protocol crlf="yes">
+	POST /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 158
+	Content-Type: text/info; boundary=------------------------
+
+	--------------------------
+	Content-Disposition: attachment; name="name"
+
+	daniel
+	----------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test278+8 -8

@@ -37,14 +37,14 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
-	Host: we.want.that.site.com
-	Proxy-Authorization: Basic %b64[fake:]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+	Host: we.want.that.site.com
+	Proxy-Authorization: Basic %b64[fake:]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test279+8 -8

@@ -38,14 +38,14 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
-	Host: we.want.that.site.com
-	Proxy-Authorization: Basic %b64[fake:]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+	Host: we.want.that.site.com
+	Proxy-Authorization: Basic %b64[fake:]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test28+11 -11

@@ -58,17 +58,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /online/1,1795,Welcome,00.html/%TESTNUMBER0002.txt?logout=TRUE HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test280+10 -10

@@ -46,16 +46,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-alternative-to-user "USER replacement"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	USER replacement
-	PASS [email protected]
-	PWD
-	CWD %TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	USER replacement
+	PASS [email protected]
+	PWD
+	CWD %TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test282+6 -6

@@ -32,12 +32,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test287+6 -6

@@ -37,12 +37,12 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Connection: Keep-Alive
-	User-Agent: looser/2007
-
+	<protocol crlf="yes">
+	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Connection: Keep-Alive
+	User-Agent: looser/2007
+
	</protocol>
	# CURLE_RECV_ERROR
	<errorcode>

tests/data/test29+6 -6

@@ -39,12 +39,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -m 2

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	28

tests/data/test290+8 -8

@@ -30,14 +30,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 30
	<errorcode>
	63
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test291+9 -9

@@ -33,15 +33,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --max-filesize 100

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test292+6 -6

@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 1000
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test293+6 -6

@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2
	<errorcode>
	63
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test294+10 -10

@@ -47,16 +47,16 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/ --ftp-account "data for acct"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	ACCT data for acct
-	PWD
-	CWD %TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	ACCT data for acct
+	PWD
+	CWD %TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test295+3 -3

@@ -37,9 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER/
	<errorcode>
	67
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
	</protocol>
	</verify>
	</testcase>

tests/data/test296+12 -12

@@ -31,18 +31,18 @@ FTP CWD with --ftp-method multicwd

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD first
-	CWD second
-	CWD third
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD first
+	CWD second
+	CWD third
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test297+10 -10

@@ -31,16 +31,16 @@ FTP CWD with --ftp-method singlecwd

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD first/second/third
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD first/second/third
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test298+9 -9

@@ -31,15 +31,15 @@ FTP CWD with --ftp-method nocwd

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE first/second/third/%TESTNUMBER
-	RETR first/second/third/%TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE first/second/third/%TESTNUMBER
+	RETR first/second/third/%TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test299+8 -8

@@ -39,14 +39,14 @@ FTP over HTTP proxy with user:pass not in url

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET ftp://michal:[email protected]/we/want/%TESTNUMBER HTTP/1.1
-	Host: host.com:21
-	Authorization: Basic %b64[michal:aybabtu]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET ftp://michal:[email protected]/we/want/%TESTNUMBER HTTP/1.1
+	Host: host.com:21
+	Authorization: Basic %b64[michal:aybabtu]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3+9 -9

@@ -43,15 +43,15 @@ HTTP POST with auth and contents but with content-length set to 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[fake:-user]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 37
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[fake:-user]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 37
+	Content-Type: application/x-www-form-urlencoded
+
	fooo=mooo&pooo=clue&doo=%20%20%20++++
	</protocol>
	</verify>

tests/data/test30+6 -6

@@ -27,12 +27,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	52

tests/data/test300+6 -6

@@ -40,12 +40,12 @@ simple HTTPS GET
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3000+6 -6

@@ -42,12 +42,12 @@ HTTPS localhost, first subaltname matches, CN does not match
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3001+6 -6

@@ -42,12 +42,12 @@ HTTPS localhost, last subject alt name matches, CN does not match
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3002+16 -16

@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<invalid.one>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<invalid.one>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test3003+16 -16

@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipien
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<invalid.five>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<invalid.five>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test3004+16 -16

@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt recipien
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<invalid.three>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<invalid.three>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test3005+16 -16

@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<invalid.one>
-	RCPT TO:<[email protected]>
-	RCPT TO:<invalid.three>
-	RCPT TO:<invalid.four>
-	RCPT TO:<invalid.five>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<invalid.one>
+	RCPT TO:<[email protected]>
+	RCPT TO:<invalid.three>
+	RCPT TO:<invalid.four>
+	RCPT TO:<invalid.five>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test3006+9 -9

@@ -37,15 +37,15 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<invalid.one>
-	RCPT TO:<invalid.two>
-	RCPT TO:<invalid.three>
-	RCPT TO:<invalid.four>
-	RCPT TO:<invalid.five>
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<invalid.one>
+	RCPT TO:<invalid.two>
+	RCPT TO:<invalid.three>
+	RCPT TO:<invalid.four>
+	RCPT TO:<invalid.five>
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test3007+5 -5

@@ -37,11 +37,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<invalid.one>
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<invalid.one>
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test3008+6 -6

@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /this/is/the/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /this/is/the/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/%TESTNUMBER">
	-foo-

tests/data/test3009+6 -6

@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/not-there
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /this/is/the/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /this/is/the/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	23

tests/data/test301+7 -7

@@ -40,13 +40,13 @@ HTTPS GET with user and password
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	Authorization: Basic %b64[fake:user]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	Authorization: Basic %b64[fake:user]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<data>
	[insert full protocol verifiction dump here]

tests/data/test3011+6 -6

@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR/tm
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /this/is/the/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /this/is/the/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/tmp/%TESTNUMBER">
	-foo-

tests/data/test3012+6 -6

@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJR --output-dir %PWD/%LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /this/is/the/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /this/is/the/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/MMM%TESTNUMBERMMM">
	-foo-

tests/data/test3013+11 -11

@@ -46,17 +46,17 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR ht
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /this/is/the/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /another/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /this/is/the/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /another/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/%TESTNUMBER">
	-foo-

tests/data/test3014+6 -6

@@ -45,12 +45,12 @@ Content-Type: text/plain
	testdata
	4
	</stdout>
-	<protocol>
-	GET /1439 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /1439 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3015+11 -11

@@ -57,17 +57,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_headers}\n" -L -o%DEV_NULL
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<stdout mode="text">

tests/data/test3023+6 -6

@@ -46,12 +46,12 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3024+6 -6

@@ -46,12 +46,12 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3027+10 -10

@@ -40,16 +40,16 @@ data blobb

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	MDTM %TESTNUMBER
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	MDTM %TESTNUMBER
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test3028+7 -7

@@ -60,13 +60,13 @@ Proxy-Connection: Keep-Alive

	</proxy>

-	<protocol>
-	proxy-line
-	GET /page HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	proxy-line
+	GET /page HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test303+6 -6

@@ -43,12 +43,12 @@ HTTPS with 8 secs timeout

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	28

tests/data/test3031+6 -6

@@ -43,12 +43,12 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER --dump-header %PWD/%LOGDIR/tmp/
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /this/is/the/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /this/is/the/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/tmp/out.txt" crlf="yes">
	HTTP/1.1 200 OK

tests/data/test3032+21 -21

@@ -86,27 +86,27 @@ HTTP redirect loop 3x swsbounce test

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3035+30 -30

@@ -87,36 +87,36 @@ HTTP retry failed download with keep data and auto-resume

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=5-
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=11-
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=11-
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=11-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=5-
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=11-
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=11-
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=11-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	<file1 name="%LOGDIR/outfile%TESTNUMBER" nonewline="yes">

tests/data/test306+6 -6

@@ -52,12 +52,12 @@ HTTPS GET, receive no headers only data!
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test307+6 -6

@@ -43,12 +43,12 @@ simple HTTPS GET with openssl engine
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test309+11 -11

@@ -65,17 +65,17 @@ HTTP Location: redirect to HTTPS URL

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test31+6 -6

@@ -99,12 +99,12 @@ local-http

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: test31.curl:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: test31.curl:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
	# Netscape HTTP Cookie File

tests/data/test310+6 -6

@@ -42,12 +42,12 @@ simple HTTPS GET
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3100+10 -10

@@ -69,16 +69,16 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
-	CSeq: 1
-	Accept: application/sdp
-
-	DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
-	CSeq: 2
-	Accept: application/sdp
-	Authorization: Basic %b64[user:pass]b64%d29yZA==
-
+	<protocol crlf="yes">
+	DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
+	CSeq: 1
+	Accept: application/sdp
+
+	DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
+	CSeq: 2
+	Accept: application/sdp
+	Authorization: Basic %b64[user:pass]b64%d29yZA==
+
	</protocol>
	</verify>

tests/data/test3101+10 -10

@@ -72,16 +72,16 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:pass]b64%d29yZA==
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:pass]b64%d29yZA==
+	Accept: /
+
	</protocol>
	</verify>

tests/data/test3102+5 -5

@@ -38,11 +38,11 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test314+7 -7

@@ -174,13 +174,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	</verify>
	</testcase>

tests/data/test315+7 -7

@@ -60,13 +60,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	<errorcode>
	61

tests/data/test316+7 -7

@@ -60,13 +60,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	</verify>
	</testcase>

tests/data/test317+16 -16

@@ -75,22 +75,22 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: first.host.it.is
-	Proxy-Authorization: Basic %b64[testing:this]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Authorization: s3cr3t
-
-	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
-	Host: goto.second.host.now
-	Proxy-Authorization: Basic %b64[testing:this]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: first.host.it.is
+	Proxy-Authorization: Basic %b64[testing:this]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Authorization: s3cr3t
+
+	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
+	Host: goto.second.host.now
+	Proxy-Authorization: Basic %b64[testing:this]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test318+17 -17

@@ -75,23 +75,23 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: first.host.it.is
-	Proxy-Authorization: Basic %b64[testing:this]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Authorization: s3cr3t
-
-	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
-	Host: goto.second.host.now
-	Proxy-Authorization: Basic %b64[testing:this]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Authorization: s3cr3t
-
+	<protocol crlf="yes">
+	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: first.host.it.is
+	Proxy-Authorization: Basic %b64[testing:this]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Authorization: s3cr3t
+
+	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
+	Host: goto.second.host.now
+	Proxy-Authorization: Basic %b64[testing:this]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Authorization: s3cr3t
+
	</protocol>
	</verify>
	</testcase>

tests/data/test319+6 -6

@@ -48,12 +48,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test320+0 -2

@@ -56,8 +56,6 @@ simple TLS-SRP HTTPS GET, check user in response

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	</protocol>
	<file name="%LOGDIR/curl%TESTNUMBER.out">
	HTTP/1.0 200 OK
	Content-type: text/html

tests/data/test3201+8 -8

@@ -50,14 +50,14 @@ proxy
	<strippart>
	s/^PROXY TCP4 192.168.1.1 %HOSTIP (\d*) %HTTPPORT/proxy-line/
	</strippart>
-	<protocol>
-	proxy-line
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Testno: %TESTNUMBER
-
+	<protocol crlf="yes">
+	proxy-line
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Testno: %TESTNUMBER
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3202+7 -7

@@ -55,13 +55,13 @@ proxy
	<strippart>
	s/^PROXY TCP6 2001:db8:: ::1 (\d*) %HTTP6PORT/proxy-line/
	</strippart>
-	<protocol>
-	proxy-line
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOST6IP:%HTTP6PORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	proxy-line
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOST6IP:%HTTP6PORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test3204+7 -7

@@ -37,13 +37,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et

	# Verify that the file still exists with the correct etag value.
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-None-Match: "21025-dc7-39462498"
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-None-Match: "21025-dc7-39462498"
+
	</protocol>
	<file name="%LOGDIR/etag%TESTNUMBER">
	"21025-dc7-39462498"

tests/data/test3206+6 -6

@@ -37,12 +37,12 @@ IMAP custom FETCH with larger literal response (~7KB)
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 456 BODY[TEXT]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 456 BODY[TEXT]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test3215+12 -12

@@ -38,19 +38,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt "<[email protected]> NOTIFY
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]> RET=HDRS
-	RCPT TO:<[email protected]> NOTIFY=SUCCESS,FAILURE
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]> RET=HDRS
+	RCPT TO:<[email protected]> NOTIFY=SUCCESS,FAILURE
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test325+6 -6

@@ -49,12 +49,12 @@ HTTPS with attempted redirect to denied HTTP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# 1 - Protocol http not supported or disabled in libcurl
	<errorcode>

tests/data/test326+6 -6

@@ -53,12 +53,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test327+12 -12

@@ -52,18 +52,18 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/want/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: foobar=name
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/want/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: foobar=name
+
	</protocol>
	<file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
	# Netscape HTTP Cookie File

tests/data/test328+6 -6

@@ -44,12 +44,12 @@ http://%HOSTIP:%HTTPPORT/hello/%TESTNUMBER --compressed
	<strip>
	^Accept-Encoding:.*
	</strip>
-	<protocol>
-	GET /hello/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /hello/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test329+13 -13

@@ -59,19 +59,19 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: host.foo.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: tester=yes; test=no
-
-	GET /we/want/%TESTNUMBER0002 HTTP/1.1
-	Host: host.foo.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: tester=yes
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: host.foo.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: tester=yes; test=no
+
+	GET /we/want/%TESTNUMBER0002 HTTP/1.1
+	Host: host.foo.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: tester=yes
+
	</protocol>
	</verify>
	</testcase>

tests/data/test330+14 -14

@@ -74,20 +74,20 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: first.host.it.is
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Cookie: test=yes
-
-	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
-	Host: goto.second.host.now
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: first.host.it.is
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Cookie: test=yes
+
+	GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1
+	Host: goto.second.host.now
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test331+14 -14

@@ -50,20 +50,20 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://moo/we/want/%TESTNUMBER HTTP/1.1
-	Host: moo
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://moo/we/want/%TESTNUMBER0002 HTTP/1.1
-	Host: moo
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Cookie: moo=yes
-
+	<protocol crlf="yes">
+	GET http://moo/we/want/%TESTNUMBER HTTP/1.1
+	Host: moo
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://moo/we/want/%TESTNUMBER0002 HTTP/1.1
+	Host: moo
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Cookie: moo=yes
+
	</protocol>
	</verify>
	</testcase>

tests/data/test334+6 -6

@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test335+22 -22

@@ -74,28 +74,28 @@ http://digest:[email protected]/%TESTNUMBER --p

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
-	Host: data.from.server.requiring.digest.hohoho.com
-	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"
-	Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="ea0f4cb7a119a1a6f6c6c6c2e4190860"
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
+	Host: data.from.server.requiring.digest.hohoho.com
+	Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="f61609cd8f5bb205ef4e169b2c5626cb"
+	Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/%TESTNUMBER", response="ea0f4cb7a119a1a6f6c6c6c2e4190860"
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test336+12 -12

@@ -41,18 +41,18 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 3
-	RETR %TESTNUMBER
-	ABOR
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 3
+	RETR %TESTNUMBER
+	ABOR
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test337+12 -12

@@ -41,18 +41,18 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --range 3-6

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	PASV
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 3
-	RETR %TESTNUMBER
-	ABOR
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	PASV
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 3
+	RETR %TESTNUMBER
+	ABOR
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test339+6 -6

@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/etag%TESTNUMBER">
	W/"asdf"

tests/data/test34+6 -6

@@ -52,12 +52,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>

tests/data/test340+4 -4

@@ -28,10 +28,10 @@ FTP using %00 in path with singlecwd

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
	</protocol>
	<errorcode>
	3

tests/data/test341+7 -7

@@ -46,13 +46,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-None-Match: ""
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-None-Match: ""
+
	</protocol>
	</verify>

tests/data/test342+7 -7

@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-None-Match: "21025-dc7-39462498"
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-None-Match: "21025-dc7-39462498"
+
	</protocol>
	</verify>
	</testcase>

tests/data/test343+7 -7

@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-None-Match: "21025-dc7-39462498"
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-None-Match: "21025-dc7-39462498"
+
	</protocol>
	<file name="%LOGDIR/out%TESTNUMBER">
	"21025-dc7-11111"

tests/data/test344+7 -7

@@ -41,13 +41,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-None-Match: ""
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-None-Match: ""
+
	</protocol>
	<file name="%LOGDIR/etag%TESTNUMBER">
	"21025-dc7-11111"

tests/data/test345+7 -7

@@ -44,13 +44,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-None-Match: "21025-dc7-39462498"
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-None-Match: "21025-dc7-39462498"
+
	</protocol>
	<file name="%LOGDIR/etag%TESTNUMBER">
	"21025-dc7-11111"

tests/data/test346+9 -9

@@ -44,15 +44,15 @@ HTTP GET over proxy with credentials using blank passwords

	#
	<verify>
-	<protocol>
-	GET http://remote.example/%TESTNUMBER HTTP/1.1
-	Host: remote.example
-	Proxy-Authorization: Basic %b64[puser:]b64%
-	Authorization: Basic %b64[suser:]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://remote.example/%TESTNUMBER HTTP/1.1
+	Host: remote.example
+	Proxy-Authorization: Basic %b64[puser:]b64%
+	Authorization: Basic %b64[suser:]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test347+6 -6

@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/etag%TESTNUMBER">
	</file>

tests/data/test348+8 -8

@@ -44,14 +44,14 @@ that FTP
	works
	so does it?
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	# 70 - CURLE_REMOTE_DISK_FULL
	<errorcode>

tests/data/test349+6 -6

@@ -31,12 +31,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	22

tests/data/test350+9 -9

@@ -41,15 +41,15 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method multicwd
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD /
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD /
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test351+8 -8

@@ -41,14 +41,14 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method nocwd
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST /
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST /
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test352+9 -9

@@ -41,15 +41,15 @@ ftp://%HOSTIP:%FTPPORT// --ftp-method singlecwd
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD /
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD /
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test353+8 -8

@@ -41,14 +41,14 @@ ftp://%HOSTIP:%FTPPORT/ --ftp-method singlecwd
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test354+8 -8

@@ -37,14 +37,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test355+6 -6

@@ -44,12 +44,12 @@ h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test356+6 -6

@@ -50,12 +50,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stripfile>
	# strip out the (dynamic) expire date from the file so that the rest

tests/data/test36+6 -6

@@ -52,12 +52,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<errorcode>
	56
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>

tests/data/test361+11 -11

@@ -31,17 +31,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	22

tests/data/test362+9 -9

@@ -37,15 +37,15 @@ that FTP
	works
	so does it?
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test363+8 -8

@@ -74,14 +74,14 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol nonewline="yes">
-	POST /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 27
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 27
+	Content-Type: application/x-www-form-urlencoded
+
	datatopost=ohthatsfunyesyes
	</protocol>
	</verify>

tests/data/test365+6 -6

@@ -54,12 +54,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test366+6 -6

@@ -37,12 +37,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --retry 2 --retry-max-time 10
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test367+7 -7

@@ -36,13 +36,13 @@ http://:example@%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[:example]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[:example]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test368+7 -7

@@ -37,13 +37,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -r 4
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=4-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=4-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test369+6 -6

@@ -36,12 +36,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/nowhere/etag%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test37+6 -6

@@ -33,12 +33,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<errorcode>
	52
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>

tests/data/test371+6 -6

@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/dump -o %LOGDIR/dump2 --no-progr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stderr mode="text">
	Warning: Got more output options than URLs

tests/data/test372+6 -6

@@ -35,12 +35,12 @@ proxy
	</client>

	<verify>
-	<protocol>
-	GET /binary-zero-in-data-section/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /binary-zero-in-data-section/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	0

tests/data/test373+6 -6

@@ -64,12 +64,12 @@ http://%HOSTIP:%HTTPPORT/chunked-transfer-encoding/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /chunked-transfer-encoding/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /chunked-transfer-encoding/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	0

tests/data/test374+6 -6

@@ -35,12 +35,12 @@ http://%HOSTIP:%HTTPPORT/gif/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /gif/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /gif/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	0

tests/data/test376+6 -6

@@ -45,12 +45,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-err
	<errorcode>
	18
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# the file should be empty now

tests/data/test379+6 -6

@@ -48,12 +48,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clob
	<errorcode>
	18
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# this file should be untouched

tests/data/test38+7 -7

@@ -41,13 +41,13 @@ download on.
	<errorcode>
	33
	</errorcode>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=78-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=78-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# the download target file must remain untouched

tests/data/test380+8 -8

@@ -48,14 +48,14 @@ machine %HOSTIP login mary password yram
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER mary
-	PASS yram
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER mary
+	PASS yram
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test381+8 -8

@@ -52,14 +52,14 @@ machine %HOSTIP login mary password yram
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER mary
-	PASS drfrank
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER mary
+	PASS drfrank
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test383+8 -8

@@ -42,14 +42,14 @@ HTTP with --json
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Content-Type: application/json
-	Accept: application/json
-	Content-Length: 21
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Content-Type: application/json
+	Accept: application/json
+	Content-Length: 21
+
	{ "drink": "coffee" }
	</protocol>
	</verify>

tests/data/test385+8 -8

@@ -42,14 +42,14 @@ HTTP with --json x 2
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Content-Type: drinks/hot
-	Accept: application/json
-	Content-Length: 41
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Content-Type: drinks/hot
+	Accept: application/json
+	Content-Length: 41
+
	{ "drink": "coffee", "crunch": "cookie" }
	</protocol>
	</verify>

tests/data/test386+13 -13

@@ -56,19 +56,19 @@ HTTP with --json + --next
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Content-Type: application/json
-	Accept: application/json
-	Content-Length: 21
-
-	{ "drink": "coffee" }GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Content-Type: application/json
+	Accept: application/json
+	Content-Length: 21
+
+	{ "drink": "coffee" }GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test387+8 -8

@@ -38,14 +38,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -sS --tr-encoding
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	TE: gzip
-	Connection: TE
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	TE: gzip
+	Connection: TE
+
	</protocol>

	# CURLE_BAD_CONTENT_ENCODING is 61

tests/data/test389+6 -6

@@ -46,12 +46,12 @@ local-http
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: curlmachine.localhost:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: curlmachine.localhost:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test391+11 -11

@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/../../%TESTNUMBER --path-as-is -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /../../%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /../../%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test392+12 -12

@@ -45,18 +45,18 @@ local-http

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: foobar=name
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: foobar=name
+
	</protocol>
	</verify>
	</testcase>

tests/data/test393+6 -6

@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2000000
	<errorcode>
	63
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test394+6 -6

@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test395+6 -6

@@ -42,12 +42,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test396+7 -7

@@ -171,13 +171,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	</verify>
	</testcase>

tests/data/test397+7 -7

@@ -61,13 +61,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Accept-Encoding: xxx
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Accept-Encoding: xxx
+
	</protocol>
	</verify>
	</testcase>

tests/data/test398+6 -6

@@ -46,12 +46,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	8

tests/data/test4+19 -19

@@ -37,25 +37,25 @@ Replaced internal and added custom HTTP headers
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	extra-header: here
-	Accept: replaced
-	X-Custom-Header:
-	X-Test: foo;
-	X-Test2: foo;
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	extra-header: here
-	Accept: replaced
-	X-Custom-Header:
-	X-Test: foo;
-	X-Test2: foo;
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	extra-header: here
+	Accept: replaced
+	X-Custom-Header:
+	X-Test: foo;
+	X-Test2: foo;
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	extra-header: here
+	Accept: replaced
+	X-Custom-Header:
+	X-Test: foo;
+	X-Test2: foo;
+
	</protocol>
	</verify>
	</testcase>

tests/data/test40+11 -11

@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/are/all/moo.html/?name=d+a+niel&testcase=/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/are/all/moo.html/?name=d+a+niel&testcase=/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test400+10 -10

@@ -45,16 +45,16 @@ FTPS dir list PASV unencrypted data
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PBSZ 0
-	PROT C
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PBSZ 0
+	PROT C
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test4000+6 -6

@@ -40,12 +40,12 @@ HTTPS GET with ECH GREASE
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test401+10 -10

@@ -42,16 +42,16 @@ that FTPS
	works
	so does it?
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PBSZ 0
-	PROT C
-	PWD
-	EPSV
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PBSZ 0
+	PROT C
+	PWD
+	EPSV
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test402+3 -3

@@ -28,9 +28,9 @@ FTP SSL required on non-SSL server
	<errorcode>
	64
	</errorcode>
-	<protocol>
-	AUTH SSL
-	AUTH TLS
+	<protocol crlf="yes">
+	AUTH SSL
+	AUTH TLS
	</protocol>
	</verify>
	</testcase>

tests/data/test403+11 -11

@@ -47,17 +47,17 @@ FTPS with CCC not supported by server
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PBSZ 0
-	PROT C
-	CCC
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PBSZ 0
+	PROT C
+	CCC
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test406+10 -10

@@ -50,16 +50,16 @@ FTPS dir list, PORT with specified IP
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PBSZ 0
-	PROT C
-	PWD
-	PORT 127,0,0,1,243,212
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PBSZ 0
+	PROT C
+	PWD
+	PORT 127,0,0,1,243,212
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test407+16 -16

@@ -39,22 +39,22 @@ data blobb

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PBSZ 0
-	PROT C
-	PWD
-	CWD a
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PBSZ 0
+	PROT C
+	PWD
+	CWD a
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test408+13 -13

@@ -40,19 +40,19 @@ Moooooooooooo
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PBSZ 0
-	PROT C
-	PWD
-	CWD CWD
-	CWD STOR
-	CWD RETR
-	PORT 127,0,0,1,5,109
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PBSZ 0
+	PROT C
+	PWD
+	CWD CWD
+	CWD STOR
+	CWD RETR
+	PORT 127,0,0,1,5,109
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	<upload>
	Moooooooooooo

tests/data/test409+10 -10

@@ -42,16 +42,16 @@ that FTP
	works
	so does it?
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PBSZ 0
-	PROT C
-	PWD
-	EPSV
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PBSZ 0
+	PROT C
+	PWD
+	EPSV
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test410+7 -7

@@ -43,13 +43,13 @@ Long: %repeat[3500 x header content]%
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Long: %repeat[3500 x header content]%
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Long: %repeat[3500 x header content]%
+
	</protocol>
	</verify>
	</testcase>

tests/data/test412+7 -7

@@ -52,13 +52,13 @@ h1 whohoo 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: whohoo.:12345
-	User-Agent: curl/%VERSION
-	Accept: /
-	Alt-Used: %HOSTIP:%HTTPPORT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: whohoo.:12345
+	User-Agent: curl/%VERSION
+	Accept: /
+	Alt-Used: %HOSTIP:%HTTPPORT
+
	</protocol>
	</verify>
	</testcase>

tests/data/test413+7 -7

@@ -52,13 +52,13 @@ h1 whohoo. 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: whohoo:12345
-	User-Agent: curl/%VERSION
-	Accept: /
-	Alt-Used: %HOSTIP:%HTTPPORT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: whohoo:12345
+	User-Agent: curl/%VERSION
+	Accept: /
+	Alt-Used: %HOSTIP:%HTTPPORT
+
	</protocol>
	</verify>
	</testcase>

tests/data/test414+17 -17

@@ -62,23 +62,23 @@ https://attack.invalid:%HTTPSPORT/a/b/%TESTNUMBER --insecure -c %LOGDIR/cookie%T
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /a/b/%TESTNUMBER HTTP/1.1
-	Host: attack.invalid:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /a/b/%TESTNUMBER0002 HTTP/1.1
-	Host: attack.invalid:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /a/b/%TESTNUMBER0003 HTTP/1.1
-	Host: attack.invalid:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: SESSIONID=originaltoken; second=originaltoken
-
+	<protocol crlf="yes">
+	GET /a/b/%TESTNUMBER HTTP/1.1
+	Host: attack.invalid:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /a/b/%TESTNUMBER0002 HTTP/1.1
+	Host: attack.invalid:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /a/b/%TESTNUMBER0003 HTTP/1.1
+	Host: attack.invalid:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: SESSIONID=originaltoken; second=originaltoken
+
	</protocol>
	</verify>
	</testcase>

tests/data/test415+6 -6

@@ -41,12 +41,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# built-in curl returns weird_server_reply

tests/data/test416+8 -8

@@ -38,14 +38,14 @@ FTP growing file support

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test417+6 -6

@@ -38,12 +38,12 @@ https
	</command>
	</client>
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stripfile>
	s/^(.):(.)[\r\n]*//

tests/data/test42+11 -11

@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/are/all/m%20o%20o.html/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/are/all/m%20o%20o.html/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test43+13 -13

@@ -63,19 +63,19 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://%HOSTIP:%HTTPPORT/want/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test430+25 -25

@@ -70,31 +70,31 @@ Three -K uses with --next and --data in each
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	a: a
-	Content-Length: 1
-	Content-Type: application/x-www-form-urlencoded
-
-	aPOST /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	b: b
-	Content-Length: 1
-	Content-Type: application/x-www-form-urlencoded
-
-	bPOST /%TESTNUMBER0003 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	c: c
-	Content-Length: 1
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	a: a
+	Content-Length: 1
+	Content-Type: application/x-www-form-urlencoded
+
+	aPOST /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	b: b
+	Content-Length: 1
+	Content-Type: application/x-www-form-urlencoded
+
+	bPOST /%TESTNUMBER0003 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	c: c
+	Content-Length: 1
+	Content-Type: application/x-www-form-urlencoded
+
	c
	</protocol>
	</verify>

tests/data/test431+25 -25

@@ -64,31 +64,31 @@ Two -K uses with --next and then one on cmdline
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	a: a
-	Content-Length: 1
-	Content-Type: application/x-www-form-urlencoded
-
-	aPOST /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	b: b
-	Content-Length: 1
-	Content-Type: application/x-www-form-urlencoded
-
-	bPOST /%TESTNUMBER0003 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	c: c
-	Content-Length: 1
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	a: a
+	Content-Length: 1
+	Content-Type: application/x-www-form-urlencoded
+
+	aPOST /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	b: b
+	Content-Length: 1
+	Content-Type: application/x-www-form-urlencoded
+
+	bPOST /%TESTNUMBER0003 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	c: c
+	Content-Length: 1
+	Content-Type: application/x-www-form-urlencoded
+
	c
	</protocol>
	</verify>

tests/data/test432+25 -25

@@ -69,31 +69,31 @@ Use -K with --next and --config from within
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	a: a
-	Content-Length: 1
-	Content-Type: application/x-www-form-urlencoded
-
-	aPOST /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	b: b
-	Content-Length: 1
-	Content-Type: application/x-www-form-urlencoded
-
-	bPOST /%TESTNUMBER0003 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	c: c
-	Content-Length: 1
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	a: a
+	Content-Length: 1
+	Content-Type: application/x-www-form-urlencoded
+
+	aPOST /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	b: b
+	Content-Length: 1
+	Content-Type: application/x-www-form-urlencoded
+
+	bPOST /%TESTNUMBER0003 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	c: c
+	Content-Length: 1
+	Content-Type: application/x-www-form-urlencoded
+
	c
	</protocol>
	</verify>

tests/data/test433+9 -9

@@ -44,15 +44,15 @@ Verify XDG_CONFIG_HOME use to find curlrc
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	a: a
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	a: a
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	curlrc read
	</protocol>
	</verify>

tests/data/test434+6 -6

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

	#
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test435+11 -11

@@ -33,17 +33,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'lo
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# replace the number with a fixed string since the port number is not

tests/data/test436+9 -9

@@ -44,15 +44,15 @@ Find .curlrc in .config/curlrc via CURL_HOME
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol nonewline="yes">
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	a: a
-	Content-Length: 11
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	a: a
+	Content-Length: 11
+	Content-Type: application/x-www-form-urlencoded
+
	curlrc read
	</protocol>
	</verify>

tests/data/test437+6 -6

@@ -48,12 +48,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stripfile>
	# strip out the (dynamic) expire date from the file so that the rest

tests/data/test440+6 -6

@@ -52,12 +52,12 @@ test-duphandle

	<verify>
	# we let it CONNECT to the server to confirm HSTS but deny from there
-	<protocol>
-	CONNECT this.hsts.example.:443 HTTP/1.1
-	Host: this.hsts.example.:443
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	CONNECT this.hsts.example.:443 HTTP/1.1
+	Host: this.hsts.example.:443
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<stdout>
	HTTP/1.1 403 not OK at all

tests/data/test441+6 -6

@@ -51,12 +51,12 @@ test-duphandle

	<verify>
	# we let it CONNECT to the server to confirm HSTS but deny from there
-	<protocol>
-	CONNECT this.hsts.example:443 HTTP/1.1
-	Host: this.hsts.example:443
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	CONNECT this.hsts.example:443 HTTP/1.1
+	Host: this.hsts.example:443
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<stdout>
	HTTP/1.1 403 not OK at all

tests/data/test442+7 -7

@@ -201,13 +201,13 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /a/b/%TESTNUMBER HTTP/1.1
-	Host: attack.invalid:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: name150=could-be-large-150; name149=could-be-large-149; name148=could-be-large-148; name147=could-be-large-147; name146=could-be-large-146; name145=could-be-large-145; name144=could-be-large-144; name143=could-be-large-143; name142=could-be-large-142; name141=could-be-large-141; name140=could-be-large-140; name139=could-be-large-139; name138=could-be-large-138; name137=could-be-large-137; name136=could-be-large-136; name135=could-be-large-135; name134=could-be-large-134; name133=could-be-large-133; name132=could-be-large-132; name131=could-be-large-131; name130=could-be-large-130; name129=could-be-large-129; name128=could-be-large-128; name127=could-be-large-127; name126=could-be-large-126; name125=could-be-large-125; name124=could-be-large-124; name123=could-be-large-123; name122=could-be-large-122; name121=could-be-large-121; name120=could-be-large-120; name119=could-be-large-119; name118=could-be-large-118; name117=could-be-large-117; name116=could-be-large-116; name115=could-be-large-115; name114=could-be-large-114; name113=could-be-large-113; name112=could-be-large-112; name111=could-be-large-111; name110=could-be-large-110; name109=could-be-large-109; name108=could-be-large-108; name107=could-be-large-107; name106=could-be-large-106; name105=could-be-large-105; name104=could-be-large-104; name103=could-be-large-103; name102=could-be-large-102; name101=could-be-large-101; name100=could-be-large-100; name99=could-be-large-99; name98=could-be-large-98; name97=could-be-large-97; name96=could-be-large-96; name95=could-be-large-95; name94=could-be-large-94; name93=could-be-large-93; name92=could-be-large-92; name91=could-be-large-91; name90=could-be-large-90; name89=could-be-large-89; name88=could-be-large-88; name87=could-be-large-87; name86=could-be-large-86; name85=could-be-large-85; name84=could-be-large-84; name83=could-be-large-83; name82=could-be-large-82; name81=could-be-large-81; name80=could-be-large-80; name79=could-be-large-79; name78=could-be-large-78; name77=could-be-large-77; name76=could-be-large-76; name75=could-be-large-75; name74=could-be-large-74; name73=could-be-large-73; name72=could-be-large-72; name71=could-be-large-71; name70=could-be-large-70; name69=could-be-large-69; name68=could-be-large-68; name67=could-be-large-67; name66=could-be-large-66; name65=could-be-large-65; name64=could-be-large-64; name63=could-be-large-63; name62=could-be-large-62; name61=could-be-large-61; name60=could-be-large-60; name59=could-be-large-59; name58=could-be-large-58; name57=could-be-large-57; name56=could-be-large-56; name55=could-be-large-55; name54=could-be-large-54; name53=could-be-large-53; name52=could-be-large-52; name51=could-be-large-51; name50=could-be-large-50; name49=could-be-large-49; name48=could-be-large-48; name47=could-be-large-47; name46=could-be-large-46; name45=could-be-large-45; name44=could-be-large-44; name43=could-be-large-43; name42=could-be-large-42; name41=could-be-large-41; name40=could-be-large-40; name39=could-be-large-39; name38=could-be-large-38; name37=could-be-large-37; name36=could-be-large-36; name35=could-be-large-35; name34=could-be-large-34; name33=could-be-large-33; name32=could-be-large-32; name31=could-be-large-31; name30=could-be-large-30; name29=could-be-large-29; name28=could-be-large-28; name27=could-be-large-27; name26=could-be-large-26; name25=could-be-large-25; name24=could-be-large-24; name23=could-be-large-23; name22=could-be-large-22; name21=could-be-large-21; name20=could-be-large-20; name19=could-be-large-19; name18=could-be-large-18; name17=could-be-large-17; name16=could-be-large-16; name15=could-be-large-15; name14=could-be-large-14; name13=could-be-large-13; name12=could-be-large-12; name11=could-be-large-11; name10=could-be-large-10; name9=could-be-large-9; name8=could-be-large-8; name7=could-be-large-7; name6=could-be-large-6; name5=could-be-large-5; name4=could-be-large-4; name3=could-be-large-3; name2=could-be-large-2; name1=could-be-large-1
-
+	<protocol crlf="yes">
+	GET /a/b/%TESTNUMBER HTTP/1.1
+	Host: attack.invalid:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: name150=could-be-large-150; name149=could-be-large-149; name148=could-be-large-148; name147=could-be-large-147; name146=could-be-large-146; name145=could-be-large-145; name144=could-be-large-144; name143=could-be-large-143; name142=could-be-large-142; name141=could-be-large-141; name140=could-be-large-140; name139=could-be-large-139; name138=could-be-large-138; name137=could-be-large-137; name136=could-be-large-136; name135=could-be-large-135; name134=could-be-large-134; name133=could-be-large-133; name132=could-be-large-132; name131=could-be-large-131; name130=could-be-large-130; name129=could-be-large-129; name128=could-be-large-128; name127=could-be-large-127; name126=could-be-large-126; name125=could-be-large-125; name124=could-be-large-124; name123=could-be-large-123; name122=could-be-large-122; name121=could-be-large-121; name120=could-be-large-120; name119=could-be-large-119; name118=could-be-large-118; name117=could-be-large-117; name116=could-be-large-116; name115=could-be-large-115; name114=could-be-large-114; name113=could-be-large-113; name112=could-be-large-112; name111=could-be-large-111; name110=could-be-large-110; name109=could-be-large-109; name108=could-be-large-108; name107=could-be-large-107; name106=could-be-large-106; name105=could-be-large-105; name104=could-be-large-104; name103=could-be-large-103; name102=could-be-large-102; name101=could-be-large-101; name100=could-be-large-100; name99=could-be-large-99; name98=could-be-large-98; name97=could-be-large-97; name96=could-be-large-96; name95=could-be-large-95; name94=could-be-large-94; name93=could-be-large-93; name92=could-be-large-92; name91=could-be-large-91; name90=could-be-large-90; name89=could-be-large-89; name88=could-be-large-88; name87=could-be-large-87; name86=could-be-large-86; name85=could-be-large-85; name84=could-be-large-84; name83=could-be-large-83; name82=could-be-large-82; name81=could-be-large-81; name80=could-be-large-80; name79=could-be-large-79; name78=could-be-large-78; name77=could-be-large-77; name76=could-be-large-76; name75=could-be-large-75; name74=could-be-large-74; name73=could-be-large-73; name72=could-be-large-72; name71=could-be-large-71; name70=could-be-large-70; name69=could-be-large-69; name68=could-be-large-68; name67=could-be-large-67; name66=could-be-large-66; name65=could-be-large-65; name64=could-be-large-64; name63=could-be-large-63; name62=could-be-large-62; name61=could-be-large-61; name60=could-be-large-60; name59=could-be-large-59; name58=could-be-large-58; name57=could-be-large-57; name56=could-be-large-56; name55=could-be-large-55; name54=could-be-large-54; name53=could-be-large-53; name52=could-be-large-52; name51=could-be-large-51; name50=could-be-large-50; name49=could-be-large-49; name48=could-be-large-48; name47=could-be-large-47; name46=could-be-large-46; name45=could-be-large-45; name44=could-be-large-44; name43=could-be-large-43; name42=could-be-large-42; name41=could-be-large-41; name40=could-be-large-40; name39=could-be-large-39; name38=could-be-large-38; name37=could-be-large-37; name36=could-be-large-36; name35=could-be-large-35; name34=could-be-large-34; name33=could-be-large-33; name32=could-be-large-32; name31=could-be-large-31; name30=could-be-large-30; name29=could-be-large-29; name28=could-be-large-28; name27=could-be-large-27; name26=could-be-large-26; name25=could-be-large-25; name24=could-be-large-24; name23=could-be-large-23; name22=could-be-large-22; name21=could-be-large-21; name20=could-be-large-20; name19=could-be-large-19; name18=could-be-large-18; name17=could-be-large-17; name16=could-be-large-16; name15=could-be-large-15; name14=could-be-large-14; name13=could-be-large-13; name12=could-be-large-12; name11=could-be-large-11; name10=could-be-large-10; name9=could-be-large-9; name8=could-be-large-8; name7=could-be-large-7; name6=could-be-large-6; name5=could-be-large-5; name4=could-be-large-4; name3=could-be-large-3; name2=could-be-large-2; name1=could-be-large-1
+
	</protocol>
	<limits>
	Allocations: 1100

tests/data/test443+7 -7

@@ -70,13 +70,13 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /a/b/%TESTNUMBER HTTP/1.1
-	Host: attack.invalid:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: huge-20=%repeat[500 x a]%-20; huge-19=%repeat[500 x a]%-19; huge-18=%repeat[500 x a]%-18; huge-17=%repeat[500 x a]%-17; huge-16=%repeat[500 x a]%-16; huge-15=%repeat[500 x a]%-15; huge-14=%repeat[500 x a]%-14; huge-13=%repeat[500 x a]%-13; huge-12=%repeat[500 x a]%-12; huge-11=%repeat[500 x a]%-11; huge-10=%repeat[500 x a]%-10; huge-9=%repeat[500 x a]%-9; huge-8=%repeat[500 x a]%-8; huge-7=%repeat[500 x a]%-7; huge-6=%repeat[500 x a]%-6
-
+	<protocol crlf="yes">
+	GET /a/b/%TESTNUMBER HTTP/1.1
+	Host: attack.invalid:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: huge-20=%repeat[500 x a]%-20; huge-19=%repeat[500 x a]%-19; huge-18=%repeat[500 x a]%-18; huge-17=%repeat[500 x a]%-17; huge-16=%repeat[500 x a]%-16; huge-15=%repeat[500 x a]%-15; huge-14=%repeat[500 x a]%-14; huge-13=%repeat[500 x a]%-13; huge-12=%repeat[500 x a]%-12; huge-11=%repeat[500 x a]%-11; huge-10=%repeat[500 x a]%-10; huge-9=%repeat[500 x a]%-9; huge-8=%repeat[500 x a]%-8; huge-7=%repeat[500 x a]%-7; huge-6=%repeat[500 x a]%-6
+
	</protocol>
	</verify>
	</testcase>

tests/data/test444+6 -6

@@ -126,12 +126,12 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /a/b/%TESTNUMBER HTTP/1.1
-	Host: attack.invalid:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /a/b/%TESTNUMBER HTTP/1.1
+	Host: attack.invalid:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/cookie%TESTNUMBER" mode="text">
	# Netscape HTTP Cookie File

tests/data/test45+11 -11

@@ -59,17 +59,17 @@ simple HTTP Location: without protocol in initial URL

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/data.cgi?moo=http://&/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/data.cgi?moo=http://&/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test457+6 -6

@@ -53,12 +53,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 143
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# curl: (63) Exceeded the maximum allowed file size (143)
	<errorcode>

tests/data/test46+7 -7

@@ -74,13 +74,13 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: domain..tld:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: empty=; mooo2=indeed2; mooo=indeed
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: domain..tld:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: empty=; mooo2=indeed2; mooo=indeed
+
	</protocol>
	<file name="%LOGDIR/jar%TESTNUMBER" mode="text">
	# Netscape HTTP Cookie File

tests/data/test47+6 -6

@@ -35,12 +35,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.0
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.0
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>

tests/data/test471+11 -11

@@ -54,17 +54,17 @@ Reject HTTP/1.1 to HTTP/2 switch on the same connection
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	# curl: (1) Version mismatch (from HTTP/1 to HTTP/2)
	<errorcode>

tests/data/test473+6 -6

@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/etag%TESTNUMBER">
	W/"asdf"

tests/data/test475+8 -8

@@ -33,14 +33,14 @@ FTP PASV upload ASCII file
	<upload crlf="yes" nonewline="yes">
	%repeat[1750 x a line of text used for verifying this !%0a]%
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test476+8 -8

@@ -29,14 +29,14 @@ FTP PASV upload ASCII file already using CRLF
	<upload crlf="yes" nonewline="yes">
	%repeat[1750 x a line of text used for verifying this !%0a]%
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test477+11 -11

@@ -51,17 +51,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 5 -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test478+8 -8

@@ -60,14 +60,14 @@ login debbie
	</client>

	<verify>
-	<protocol>
-	GET http://github.com/ HTTP/1.1
-	Host: github.com
-	Authorization: Basic %b64[debbie:second%0D]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://github.com/ HTTP/1.1
+	Host: github.com
+	Authorization: Basic %b64[debbie:second%0D]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test479+15 -15

@@ -87,21 +87,21 @@ default
	</client>

	<verify>
-	<protocol>
-	GET http://a.com/ HTTP/1.1
-	Host: a.com
-	Authorization: Basic %b64[alice:alicespassword]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://b.com/%TESTNUMBER0002 HTTP/1.1
-	Host: b.com
-	Authorization: Basic %b64[bob:]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://a.com/ HTTP/1.1
+	Host: a.com
+	Authorization: Basic %b64[alice:alicespassword]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://b.com/%TESTNUMBER0002 HTTP/1.1
+	Host: b.com
+	Authorization: Basic %b64[bob:]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test483+4 -4

@@ -12,10 +12,10 @@ cookies
	<reply>
	<data crlf="yes">
	HTTP/1.1 200 OK
-	Set-Cookie: name=value; expires=Fri Feb 13 11:56:27 GMT 2132
-	Set-Cookie: name2=value; expires=Fri Feb 13 11:56:27 ; 2132
-	Set-Cookie: name3=value; expires=Fri Feb 13 11:56:27 ...................................................GMT 2132
-	Set-Cookie: name4=value; expires=Fri Feb 13 11:56:27 ....................................................GMT 2132
+	Set-Cookie: name=value; expires=Fri Feb 13 11:56:27 GMT 2132
+	Set-Cookie: name2=value; expires=Fri Feb 13 11:56:27 ; 2132
+	Set-Cookie: name3=value; expires=Fri Feb 13 11:56:27 ...................................................GMT 2132
+	Set-Cookie: name4=value; expires=Fri Feb 13 11:56:27 ....................................................GMT 2132
	Accept-Ranges: bytes
	Content-Length: 6
	Connection: close

tests/data/test486+14 -14

@@ -86,20 +86,20 @@ default
	</client>

	<verify>
-	<protocol>
-	GET http://a.com/ HTTP/1.1
-	Host: a.com
-	Authorization: Basic %b64[alice:alicespassword]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://b.com/%TESTNUMBER0002 HTTP/1.1
-	Host: b.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://a.com/ HTTP/1.1
+	Host: a.com
+	Authorization: Basic %b64[alice:alicespassword]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://b.com/%TESTNUMBER0002 HTTP/1.1
+	Host: b.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test49+11 -11

@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/are/all/moo.html/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/are/all/moo.html/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test493+6 -6

@@ -50,12 +50,12 @@ test-duphandle

	<verify>
	# we let it CONNECT to the server to confirm HSTS but deny from there
-	<protocol>
-	CONNECT this.hsts.example:443 HTTP/1.1
-	Host: this.hsts.example:443
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	CONNECT this.hsts.example:443 HTTP/1.1
+	Host: this.hsts.example:443
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<stdout>
	HTTP/1.1 403 not OK at all

tests/data/test494+9 -9

@@ -46,15 +46,15 @@ machine %HOSTIP login user1 password passwd1
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER user1
-	PASS passwd1
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER user1
+	PASS passwd1
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test495+7 -7

@@ -44,13 +44,13 @@ http://foo%40bar:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --netrc-optional
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[foo@bar:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[foo@bar:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test5+7 -7

@@ -39,13 +39,13 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test50+11 -11

@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/are/moo.html/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/are/moo.html/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test500+5 -5

@@ -48,11 +48,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	<file name="%LOGDIR/ip%TESTNUMBER">
	IP %HOSTIP
	</file>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<limits>
	Allocations: 82

tests/data/test505+10 -10

@@ -52,16 +52,16 @@ upload

	works?
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	STOR %TESTNUMBER
-	RNFR %TESTNUMBER
-	RNTO %TESTNUMBER-forreal
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	STOR %TESTNUMBER
+	RNFR %TESTNUMBER
+	RNTO %TESTNUMBER-forreal
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test51+11 -11

@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test510+18 -18

@@ -42,24 +42,24 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Transfer-Encoding: chunked
-	Content-Type: application/x-www-form-urlencoded
-	Expect: 100-continue
-
-	3
-	one
-	3
-	two
-	5
-	three
-	1d
-	and a final longer crap: four
-	0
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Transfer-Encoding: chunked
+	Content-Type: application/x-www-form-urlencoded
+	Expect: 100-continue
+
+	3
+	one
+	3
+	two
+	5
+	three
+	1d
+	and a final longer crap: four
+	0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test511+8 -8

@@ -39,14 +39,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<errorcode>
	78
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	MDTM %TESTNUMBER
-	TYPE I
-	SIZE %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	MDTM %TESTNUMBER
+	TYPE I
+	SIZE %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test512+5 -5

@@ -40,11 +40,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test514+5 -5

@@ -44,11 +44,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	HEAD /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	HEAD /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test515+7 -7

@@ -39,13 +39,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 0
-	Content-Type: application/x-www-form-urlencoded
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 0
+	Content-Type: application/x-www-form-urlencoded
+
	</protocol>
	</verify>
	</testcase>

tests/data/test516+6 -6

@@ -44,12 +44,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 0
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test518+5 -5

@@ -54,11 +54,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<valgrind>
	disable

tests/data/test519+11 -11

@@ -62,17 +62,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[monster:underbed]b64%
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[anothermonster:inwardrobe]b64%
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[monster:underbed]b64%
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[anothermonster:inwardrobe]b64%
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test52+11 -11

@@ -56,17 +56,17 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /we/are/all/twits/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /we/are/all/twits/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test520+10 -10

@@ -38,16 +38,16 @@ ftp://%HOSTIP:%FTPPORT/520
	# Verify data after the test has been "shot"
	<verify>

-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	MDTM 520
-	EPSV
-	TYPE I
-	SIZE 520
-	RETR 520
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	MDTM 520
+	EPSV
+	TYPE I
+	SIZE 520
+	RETR 520
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test521+9 -9

@@ -44,15 +44,15 @@ ftp://%HOSTIP/%TESTNUMBER/ %FTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER xxx
-	PASS yyy
-	PWD
-	CWD %TESTNUMBER
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER xxx
+	PASS yyy
+	PWD
+	CWD %TESTNUMBER
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test522+6 -6

@@ -43,12 +43,12 @@ http://%HOSTIP/%TESTNUMBER %HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[xxx:yyy]b64%
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[xxx:yyy]b64%
+	Accept: /
+
	</protocol>
	<stdout>
	hello

tests/data/test523+7 -7

@@ -49,13 +49,13 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://www.example.com:19999/%TESTNUMBER HTTP/1.1
-	Host: www.example.com:19999
-	Authorization: Basic %b64[xxx:yyy]b64%
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://www.example.com:19999/%TESTNUMBER HTTP/1.1
+	Host: www.example.com:19999
+	Authorization: Basic %b64[xxx:yyy]b64%
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<stdout>
	hello

tests/data/test524+4 -4

@@ -32,10 +32,10 @@ ftp://%HOSTIP:%FTPPORT/path/to/
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
	</protocol>

	# 3 is CURLE_URL_MALFORMAT

tests/data/test525+9 -9

@@ -41,15 +41,15 @@ Moooooooooooo
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	PORT 127,0,0,1,5,109
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	PORT 127,0,0,1,5,109
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	<upload>
	Moooooooooooo

tests/data/test526+19 -19

@@ -39,25 +39,25 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test527+19 -19

@@ -39,25 +39,25 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test528+17 -17

@@ -43,23 +43,23 @@ http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /path/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /path/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /path/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /path/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test529+9 -9

@@ -41,15 +41,15 @@ Moooooooooooo
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	PORT 127,0,0,1,5,109
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	PORT 127,0,0,1,5,109
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	<upload>
	Moooooooooooo

tests/data/test53+7 -7

@@ -43,13 +43,13 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: mooo=indeed
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: mooo=indeed
+
	</protocol>
	</verify>
	</testcase>

tests/data/test530+0 -2

@@ -43,7 +43,5 @@ http://%HOSTIP:%HTTPPORT/file%TESTNUMBER

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

tests/data/test531+9 -9

@@ -44,15 +44,15 @@ don't upload this
	^PORT \d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3},\d{1,3}
	^EPRT \\|1\\|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\\|\d{1,5}\\|
	</strip>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	PORT 127,0,0,1,5,109
-	TYPE I
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	PORT 127,0,0,1,5,109
+	TYPE I
+	STOR %TESTNUMBER
+	QUIT
	</protocol>

	</verify>

tests/data/test532+19 -19

@@ -39,25 +39,25 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test533+13 -13

@@ -37,19 +37,19 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test534+10 -10

@@ -38,16 +38,16 @@ ftp://non-existing-host.haxx.se/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TE

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test535+9 -9

@@ -55,15 +55,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test537+5 -5

@@ -54,11 +54,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<limits>
	Maximum allocated: 3200000

tests/data/test538+3 -3

@@ -37,9 +37,9 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	<errorcode>
	41
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
	</protocol>
	</verify>
	</testcase>

tests/data/test539+15 -15

@@ -43,21 +43,21 @@ ftp://%HOSTIP:%FTPPORT/path/to/the/file/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path/to/the/file
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	SYST
-	CWD /
-	EPSV
-	SIZE path/to/the/file/%TESTNUMBER0001
-	RETR path/to/the/file/%TESTNUMBER0001
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path/to/the/file
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	SYST
+	CWD /
+	EPSV
+	SIZE path/to/the/file/%TESTNUMBER0001
+	RETR path/to/the/file/%TESTNUMBER0001
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test54+6 -6

@@ -32,12 +32,12 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test541+10 -10

@@ -43,16 +43,16 @@ works?
	<verify>
	<upload>
	</upload>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	STOR %TESTNUMBER
-	EPSV
-	STOR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	STOR %TESTNUMBER
+	EPSV
+	STOR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test542+8 -8

@@ -44,14 +44,14 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	# There's no MTDM in the protocol here since this code doesn't ask for the
	# time/date of the file
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	TYPE I
-	SIZE %TESTNUMBER
-	REST 0
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	TYPE I
+	SIZE %TESTNUMBER
+	REST 0
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test546+13 -13

@@ -44,19 +44,19 @@ ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	<stdout>
	data

tests/data/test549+6 -6

@@ -49,12 +49,12 @@ ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
-	Host: www.example.com:21
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
+	Host: www.example.com:21
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<stdout>
	hello

tests/data/test55+11 -11

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

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test550+6 -6

@@ -49,12 +49,12 @@ ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT ascii
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET ftp://www.example.com/moo/%TESTNUMBER;type=a HTTP/1.1
-	Host: www.example.com:21
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET ftp://www.example.com/moo/%TESTNUMBER;type=a HTTP/1.1
+	Host: www.example.com:21
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<stdout>
	hello

tests/data/test556+4 -4

@@ -38,10 +38,10 @@ http://%HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: ninja
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: ninja
+
	</protocol>
	</verify>
	</testcase>

tests/data/test56+12 -12

@@ -44,18 +44,18 @@ header "Transfer-Encoding: chunked"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /that.site.com/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: %repeat[99999 x a]%
-	Accept: /
-	Transfer-Encoding: chunked
-	Content-Type: application/x-www-form-urlencoded
-
-	c
-	we post this
-	0
-
+	<protocol crlf="yes">
+	POST /that.site.com/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: %repeat[99999 x a]%
+	Accept: /
+	Transfer-Encoding: chunked
+	Content-Type: application/x-www-form-urlencoded
+
+	c
+	we post this
+	0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test560+5 -5

@@ -43,11 +43,11 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPSPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPSPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test561+6 -6

@@ -50,12 +50,12 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
-	Host: www.example.com:21
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
+	Host: www.example.com:21
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<stdout>
	hello

tests/data/test562+8 -8

@@ -39,14 +39,14 @@ FTP a type=A URL and CURLOPT_PORT set
	# There's no MTDM in the protocol here since this code doesn't ask for the
	# time/date of the file
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test563+6 -6

@@ -48,12 +48,12 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A HTTP/1.1
-	Host: %HOSTIP:%FTPPORT
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A HTTP/1.1
+	Host: %HOSTIP:%FTPPORT
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test564+10 -10

@@ -45,16 +45,16 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	<stdout>
	data

tests/data/test565+27 -27

@@ -78,33 +78,33 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Transfer-Encoding: chunked
-	Content-Type: application/x-www-form-urlencoded
-
-	0
-
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="foo", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="877424f750af047634dbd94f9933217b"
-	Accept: /
-	Transfer-Encoding: chunked
-	Content-Type: application/x-www-form-urlencoded
-	Expect: 100-continue
-
-	3
-	one
-	3
-	two
-	5
-	three
-	1d
-	and a final longer crap: four
-	0
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Transfer-Encoding: chunked
+	Content-Type: application/x-www-form-urlencoded
+
+	0
+
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="foo", realm="testrealm", nonce="1053604144", uri="/%TESTNUMBER", response="877424f750af047634dbd94f9933217b"
+	Accept: /
+	Transfer-Encoding: chunked
+	Content-Type: application/x-www-form-urlencoded
+	Expect: 100-continue
+
+	3
+	one
+	3
+	two
+	5
+	three
+	1d
+	and a final longer crap: four
+	0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test566+5 -5

@@ -47,11 +47,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	<file name="%LOGDIR/ip%TESTNUMBER">
	CL 0
	</file>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test567+6 -6

@@ -37,12 +37,12 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
-	CSeq: 1
-	User-Agent: test%TESTNUMBER
-	Test-Number: %TESTNUMBER
-
+	<protocol crlf="yes">
+	OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
+	CSeq: 1
+	User-Agent: test%TESTNUMBER
+	Test-Number: %TESTNUMBER
+
	</protocol>
	</verify>

tests/data/test569+25 -25

@@ -74,31 +74,31 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/idfile%TESTNUMBER.txt
	<strip>
	^If-Modified-Since:.*
	</strip>
-	<protocol>
-	SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
-	CSeq: 1
-	Transport: Fake/NotReal/JustATest;foo=baz
-
-	TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
-	CSeq: 2
-	Session: 00.+1-am-aSe55ion_id\$yes-i-am\$
-
-	SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
-	CSeq: 3
-	Transport: Fake/NotReal/JustATest;foo=baz
-
-	TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
-	CSeq: 4
-	Session: \$extraspaces
-
-	SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0
-	CSeq: 5
-	Transport: Fake/NotReal/JustATest;foo=baz
-
-	TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0006 RTSP/1.0
-	CSeq: 6
-	Session: A
-
+	<protocol crlf="yes">
+	SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
+	CSeq: 1
+	Transport: Fake/NotReal/JustATest;foo=baz
+
+	TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
+	CSeq: 2
+	Session: 00.+1-am-aSe55ion_id\$yes-i-am\$
+
+	SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
+	CSeq: 3
+	Transport: Fake/NotReal/JustATest;foo=baz
+
+	TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0004 RTSP/1.0
+	CSeq: 4
+	Session: \$extraspaces
+
+	SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0005 RTSP/1.0
+	CSeq: 5
+	Transport: Fake/NotReal/JustATest;foo=baz
+
+	TEARDOWN rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0006 RTSP/1.0
+	CSeq: 6
+	Session: A
+
	</protocol>
	<file name="%LOGDIR/idfile%TESTNUMBER.txt">
	Got Session ID: [00.+1-am-aSe55ion_id\$yes-i-am\$]

tests/data/test57+6 -6

@@ -35,12 +35,12 @@ HTTP content-type with spaces in
	<stdout mode="text">
	text/html; charset=ISO-8859-4
	</stdout>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test570+12 -12

@@ -58,18 +58,18 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
	<strip>
	^If-Modified-Since:.*
	</strip>
-	<protocol>
-	OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
-	CSeq: 1
-
-	SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
-	CSeq: 999
-	Transport: RAW/RAW/UDP;unicast;client_port=3056-3057
-
-	PLAY rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
-	CSeq: 1000
-	Session: asdf
-
+	<protocol crlf="yes">
+	OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0001 RTSP/1.0
+	CSeq: 1
+
+	SETUP rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0002 RTSP/1.0
+	CSeq: 999
+	Transport: RAW/RAW/UDP;unicast;client_port=3056-3057
+
+	PLAY rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER0003 RTSP/1.0
+	CSeq: 1000
+	Session: asdf
+
	</protocol>
	</verify>

tests/data/test573+5 -5

@@ -45,11 +45,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test574+39 -39

@@ -37,45 +37,45 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*.txt
	0
	</errorcode>
	# THERE SHOULD NOT BE "SIZE"! and one "USER/PASS"
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD fully_simulated
-	CWD UNIX
-	EPSV
-	TYPE A
-	LIST
-	EPSV
-	TYPE I
-	RETR chmod1
-	EPSV
-	RETR chmod2
-	EPSV
-	RETR chmod3
-	EPSV
-	RETR empty_file.dat
-	EPSV
-	RETR file.txt
-	EPSV
-	RETR someothertext.txt
-	EPSV
-	TYPE A
-	LIST
-	EPSV
-	TYPE I
-	RETR chmod1
-	EPSV
-	RETR chmod2
-	EPSV
-	RETR chmod3
-	EPSV
-	RETR empty_file.dat
-	EPSV
-	RETR file.txt
-	EPSV
-	RETR someothertext.txt
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD fully_simulated
+	CWD UNIX
+	EPSV
+	TYPE A
+	LIST
+	EPSV
+	TYPE I
+	RETR chmod1
+	EPSV
+	RETR chmod2
+	EPSV
+	RETR chmod3
+	EPSV
+	RETR empty_file.dat
+	EPSV
+	RETR file.txt
+	EPSV
+	RETR someothertext.txt
+	EPSV
+	TYPE A
+	LIST
+	EPSV
+	TYPE I
+	RETR chmod1
+	EPSV
+	RETR chmod2
+	EPSV
+	RETR chmod3
+	EPSV
+	RETR empty_file.dat
+	EPSV
+	RETR file.txt
+	EPSV
+	RETR someothertext.txt
+	QUIT
	</protocol>
	<stdout>
	This file should have permissions 444

tests/data/test575+61 -61

@@ -35,67 +35,67 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*
	<errorcode>
	0
	</errorcode>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD fully_simulated
-	CWD UNIX
-	EPSV
-	TYPE A
-	LIST
-	EPSV
-	TYPE I
-	RETR chmod1
-	EPSV
-	RETR chmod2
-	EPSV
-	RETR chmod3
-	EPSV
-	RETR empty_file.dat
-	EPSV
-	RETR file.txt
-	EPSV
-	RETR someothertext.txt
-	EPSV
-	TYPE A
-	LIST
-	EPSV
-	TYPE I
-	RETR chmod1
-	EPSV
-	RETR chmod2
-	EPSV
-	RETR chmod3
-	EPSV
-	RETR empty_file.dat
-	EPSV
-	RETR file.txt
-	EPSV
-	RETR someothertext.txt
-	QUIT
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD fully_simulated
-	CWD UNIX
-	EPSV
-	TYPE A
-	LIST
-	EPSV
-	TYPE I
-	RETR chmod1
-	EPSV
-	RETR chmod2
-	EPSV
-	RETR chmod3
-	EPSV
-	RETR empty_file.dat
-	EPSV
-	RETR file.txt
-	EPSV
-	RETR someothertext.txt
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD fully_simulated
+	CWD UNIX
+	EPSV
+	TYPE A
+	LIST
+	EPSV
+	TYPE I
+	RETR chmod1
+	EPSV
+	RETR chmod2
+	EPSV
+	RETR chmod3
+	EPSV
+	RETR empty_file.dat
+	EPSV
+	RETR file.txt
+	EPSV
+	RETR someothertext.txt
+	EPSV
+	TYPE A
+	LIST
+	EPSV
+	TYPE I
+	RETR chmod1
+	EPSV
+	RETR chmod2
+	EPSV
+	RETR chmod3
+	EPSV
+	RETR empty_file.dat
+	EPSV
+	RETR file.txt
+	EPSV
+	RETR someothertext.txt
+	QUIT
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD fully_simulated
+	CWD UNIX
+	EPSV
+	TYPE A
+	LIST
+	EPSV
+	TYPE I
+	RETR chmod1
+	EPSV
+	RETR chmod2
+	EPSV
+	RETR chmod3
+	EPSV
+	RETR empty_file.dat
+	EPSV
+	RETR file.txt
+	EPSV
+	RETR someothertext.txt
+	QUIT
	</protocol>
	<stdout>
	This file should have permissions 444

tests/data/test580+5 -5

@@ -53,11 +53,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	<errorcode>
	8

tests/data/test581+5 -5

@@ -45,11 +45,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test584+17 -17

@@ -62,23 +62,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	s/^--------------------------[A-Za-z0-9]*/--------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=------------------------/
	</strippart>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 156
-	Content-Type: multipart/form-data; boundary=------------------------
-
-	--------------------------
-	Content-Disposition: form-data; name="fake"
-
-	party
-	----------------------------
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 0
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 156
+	Content-Type: multipart/form-data; boundary=------------------------
+
+	--------------------------
+	Content-Disposition: form-data; name="fake"
+
+	party
+	----------------------------
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test585+5 -5

@@ -56,11 +56,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test586+9 -9

@@ -45,15 +45,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test589+6 -6

@@ -44,12 +44,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 0
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test59+6 -6

@@ -34,12 +34,12 @@ HTTP URL with slash but with "parameter"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /?mooo/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /?mooo/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test590+18 -18

@@ -90,24 +90,24 @@ http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT
	# Verify data after the test has been "shot"
	<verify>

-	<protocol>
-	GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-	Host: test.remote.example.com
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-	Host: test.remote.example.com
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
-	Host: test.remote.example.com
-	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAgACAHAAAAALAAsAcgAAAAAAAAAAAAAAhoIBAAQt1KW5CgG4YdWWcfXyfXBz1ZMCzYp37xYjBiAizmw58O6eQS7yR66eqYGWeSwl9W1lV09SS1NUQVRJT04=
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+	Host: test.remote.example.com
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+	Host: test.remote.example.com
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
+	Host: test.remote.example.com
+	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAAAgACAHAAAAALAAsAcgAAAAAAAAAAAAAAhoIBAAQt1KW5CgG4YdWWcfXyfXBz1ZMCzYp37xYjBiAizmw58O6eQS7yR66eqYGWeSwl9W1lV09SS1NUQVRJT04=
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test595+9 -9

@@ -43,15 +43,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test597+4 -4

@@ -27,10 +27,10 @@ ftp://%HOSTIP:%FTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
	</protocol>
	</verify>
	</testcase>

tests/data/test598+12 -12

@@ -66,18 +66,18 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: the-moo agent next generation
-	Accept: /
-	Referer: http://example.com/the-moo
-	Cookie: name=moo
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: the-moo agent next generation
+	Accept: /
+	Referer: http://example.com/the-moo
+	Cookie: name=moo
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test6+7 -7

@@ -38,13 +38,13 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: name=contents;name2=content2;name3=content3
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: name=contents;name2=content2;name3=content3
+
	</protocol>
	</verify>
	</testcase>

tests/data/test61+6 -6

@@ -59,12 +59,12 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: www.host.foo.com
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: www.host.foo.com
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
	# Netscape HTTP Cookie File

tests/data/test62+13 -13

@@ -49,19 +49,19 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: www.host.foo.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: test2=yes; test=yes
-
-	GET /we/want/%TESTNUMBER?hoge=fuga HTTP/1.1
-	Host: www.host.foo.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: test2=yes; test=yes
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: www.host.foo.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: test2=yes; test=yes
+
+	GET /we/want/%TESTNUMBER?hoge=fuga HTTP/1.1
+	Host: www.host.foo.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: test2=yes; test=yes
+
	</protocol>
	</verify>
	</testcase>

tests/data/test627+0 -2

@@ -34,8 +34,6 @@ Dummy test file for remove test
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	</protocol>
	<postcheck>
	%PERL %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
	</postcheck>

tests/data/test63+8 -8

@@ -41,14 +41,14 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
-	Host: we.want.that.site.com
-	Proxy-Authorization: Basic %b64[fake:user]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
+	Host: we.want.that.site.com
+	Proxy-Authorization: Basic %b64[fake:user]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test64+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="c55f7f30d83d774a3d2dcacf725abaca"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/%TESTNUMBER", response="c55f7f30d83d774a3d2dcacf725abaca"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test644+11 -11

@@ -65,17 +65,17 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -L -o %LOGDIR/out%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout mode="text">
	user.creator => curl

tests/data/test646+6 -6

@@ -54,12 +54,12 @@ X-fileheader2: This is #a
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
	<upload>
	Content-Type: multipart/mixed; boundary=----------------------------

tests/data/test647+5 -5

@@ -42,11 +42,11 @@ It may contain any type of data.
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 APPEND %TESTNUMBER (\Seen) {940}
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 APPEND %TESTNUMBER (\Seen) {940}
+	A004 LOGOUT
	</protocol>
	<upload>
	Content-Type: multipart/mixed; boundary=----------------------------

tests/data/test648+26 -26

@@ -46,33 +46,33 @@ It may contain any type of data and will be encoded in base64 for transfer.
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	Content-Type: multipart/mixed; boundary=----------------------------
-	Mime-Version: 1.0
-	From: different
-	To: another
-
-	------------------------------
-	Content-Transfer-Encoding: quoted-printable
-	Content-disposition: "inline"
-
-	This is the email inline text with a very long line containing the special =
-	character =3D and that should be split by encoder.
-	------------------------------
-	Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
-	Content-Transfer-Encoding: base64
-
-	VGhpcyBpcyBhbiBhdHRhY2hlZCBmaWxlLgoKSXQgbWF5IGNvbnRhaW4gYW55IHR5cGUgb2YgZGF0
-	YSBhbmQgd2lsbCBiZSBlbmNvZGVkIGluIGJhc2U2NCBmb3IgdHJhbnNmZXIuCg==
-	--------------------------------
-	.
+	<upload crlf="yes">
+	Content-Type: multipart/mixed; boundary=----------------------------
+	Mime-Version: 1.0
+	From: different
+	To: another
+
+	------------------------------
+	Content-Transfer-Encoding: quoted-printable
+	Content-disposition: "inline"
+
+	This is the email inline text with a very long line containing the special =
+	character =3D and that should be split by encoder.
+	------------------------------
+	Content-Disposition: attachment; filename="test%TESTNUMBER.txt"
+	Content-Transfer-Encoding: base64
+
+	VGhpcyBpcyBhbiBhdHRhY2hlZCBmaWxlLgoKSXQgbWF5IGNvbnRhaW4gYW55IHR5cGUgb2YgZGF0
+	YSBhbmQgd2lsbCBiZSBlbmNvZGVkIGluIGJhc2U2NCBmb3IgdHJhbnNmZXIuCg==
+	--------------------------------
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test649+5 -5

@@ -42,11 +42,11 @@ It contains at least an 8-bit byte value.
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
	</protocol>
	<errorcode>
	26

tests/data/test65+12 -12

@@ -66,18 +66,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="66d68d3251f1839576ba7c766cf9205b"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="2053604145", uri="/%TESTNUMBER", response="66d68d3251f1839576ba7c766cf9205b"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test650+7 -7

@@ -10,14 +10,14 @@ FORM
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 301 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
+	<data crlf="yes" nocheck="yes">
+	HTTP/1.1 301 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
	Location: /%TESTNUMBER0002
-
+
	hello
	</data>
	<data2 crlf="yes">

tests/data/test651+12 -12

@@ -58,18 +58,18 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
	# Note that the stripping above removes 12 bytes from every occurrence of the
	# boundary string and since 5 of them are in the body contents, we see
	# (5*12) == 60 bytes less
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 17151
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="hello"
-
-	%repeat[1000 x A]%%repeat[1000 x B]%%repeat[1000 x C]%%repeat[1000 x D]%%repeat[1000 x E]%%repeat[1000 x F]%%repeat[1000 x G]%%repeat[1000 x H]%%repeat[1000 x I]%%repeat[1000 x J]%%repeat[1000 x K]%%repeat[1000 x L]%%repeat[1000 x M]%%repeat[1000 x N]%%repeat[1000 x O]%%repeat[1000 x P]%%repeat[999 x Q]%
-	--------------------------------
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 17151
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="hello"
+
+	%repeat[1000 x A]%%repeat[1000 x B]%%repeat[1000 x C]%%repeat[1000 x D]%%repeat[1000 x E]%%repeat[1000 x F]%%repeat[1000 x G]%%repeat[1000 x H]%%repeat[1000 x I]%%repeat[1000 x J]%%repeat[1000 x K]%%repeat[1000 x L]%%repeat[1000 x M]%%repeat[1000 x N]%%repeat[1000 x O]%%repeat[1000 x P]%%repeat[999 x Q]%
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test652+316 -316

@@ -39,323 +39,323 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	Content-Type: multipart/mixed; boundary=----------------------------
-	Mime-Version: 1.0
-
-	------------------------------
-	Content-Disposition: attachment; filename="myfile.jpg"
-	Content-Type: image/jpeg
-	Content-Transfer-Encoding: base64
-
-	QUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZG
-	RkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExM
-	TExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFS
-	UlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dX
-	V1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0ND
-	Q0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJ
-	SUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5O
-	Tk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRU
-	VFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpa
-	WlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVF
-	RkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tL
-	S0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFR
-	UVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZX
-	V1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJC
-	QkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhI
-	SEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5O
-	Tk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NT
-	U1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZ
-	WVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVF
-	RUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpK
-	S0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQ
-	UFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZW
-	VlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFC
-	QkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dH
-	R0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1N
-	TU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNT
-	U1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhY
-	WFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERE
-	REREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpK
-	SkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09P
-	UFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVV
-	VVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFB
-	QUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZH
-	R0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExM
-	TExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJS
-	UlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hY
-	WFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0ND
-	Q0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJ
-	SUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09P
-	T09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRU
-	VVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpa
-	WlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZG
-	RkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tM
-	TExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFR
-	UVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dX
-	V1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkND
-	Q0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhI
-	SElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5O
-	Tk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRU
-	VFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZ
-	WlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVF
-	RUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tL
-	S0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBR
-	UVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZW
-	VlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJC
-	QkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hI
-	SEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1N
-	TU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NT
-	U1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZ
-	WVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERE
-	RUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpK
-	SkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQ
-	UFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVW
-	VlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFB
-	QUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dH
-	R0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1N
-	TU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJS
-	UlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhY
-	WFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERE
-	REREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJ
-	SkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09P
-	T09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVV
-	VVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpB
-	QUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZG
-	RkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExM
-	TExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJS
-	UlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dX
-	V1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0ND
-	Q0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJ
-	SUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5O
-	T09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRU
-	VFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpa
-	WlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVG
-	RkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tL
-	S0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFR
-	UVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldX
-	V1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJC
-	QkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhI
-	SEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5O
-	Tk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NT
-	VFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZ
-	WVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVF
-	RUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpL
-	S0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQ
-	UFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZW
-	VlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJC
-	QkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dH
-	R0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1N
-	TU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NT
-	U1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhY
-	WVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERE
-	RERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpK
-	SkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09Q
-	UFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVV
-	VVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFB
-	QUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdH
-	R0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExM
-	TE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJS
-	UlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhY
-	WFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0ND
-	REREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJ
-	SUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09P
-	T09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRV
-	VVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpa
-	WlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZG
-	RkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xM
-	TExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFR
-	UVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dX
-	V1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0ND
-	Q0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhI
-	SUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5O
-	Tk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRU
-	VFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVla
-	WlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVF
-	RUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tL
-	S0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFR
-	UVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZW
-	VldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJC
-	QkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhI
-	SEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1N
-	Tk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NT
-	U1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZ
-	WVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERF
-	RUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpK
-	SkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQ
-	UFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZW
-	VlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFB
-	QUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dH
-	R0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1N
-	TU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJS
-	U1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhY
-	WFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERE
-	RERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlK
-	SkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09P
-	T09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVV
-	VVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFB
-	QUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZG
-	RkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExM
-	TExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJS
-	UlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dX
-	WFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0ND
-	Q0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJ
-	SUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5P
-	T09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRU
-	VFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpa
-	WlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZG
-	RkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tL
-	S0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFR
-	UVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dX
-	V1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJC
-	Q0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhI
-	SEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5O
-	Tk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NU
-	VFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZ
-	WVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVF
-	RUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktL
-	S0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQ
-	UFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZW
-	VlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJC
-	QkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dH
-	SEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1N
-	TU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NT
-	U1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZ
-	WVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERE
-	RERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpK
-	SkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQ
-	UFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVV
-	VVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFB
-	QUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dH
-	R0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExM
-	TU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJS
-	UlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhY
-	WFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NE
-	RERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJ
-	SUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09P
-	T09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVV
-	VVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpa
-	WkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZG
-	RkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExM
-	TExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFR
-	UlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dX
-	V1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0ND
-	Q0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJ
-	SUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5O
-	Tk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRU
-	VFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpa
-	WlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVF
-	RUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tL
-	S0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFR
-	UVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZW
-	V1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJC
-	QkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhI
-	SEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1O
-	Tk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NT
-	U1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZ
-	WVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVF
-	RUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpK
-	SktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQ
-	UFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZW
-	VlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFB
-	QkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dH
-	R0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1N
-	TU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJT
-	U1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhY
-	WFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERE
-	RERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpK
-	SkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09P
-	T1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVV
-	VVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFB
-	QUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZG
-	R0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExM
-	TExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJS
-	UlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dY
-	WFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0ND
-	Q0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJ
-	SUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9P
-	T09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRU
-	VFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpa
-	WlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZG
-	RkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tL
-	TExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFR
-	UVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dX
-	V1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJD
-	Q0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhI
-	SEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5O
-	Tk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RU
-	VFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZ
-	WVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVF
-	RUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tL
-	S0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQ
-	UVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZW
-	VlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJC
-	QkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dI
-	SEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1N
-	TU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NT
-	U1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZ
-	WVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERERERE
-	REVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpK
-	SkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQ
-	UFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVV
-	VlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFB
-	QUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dH
-	R0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExN
-	TU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJS
-	UlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhY
-	WFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RE
-	RERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJ
-	SUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09P
-	T09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVV
-	VVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpa
-	QUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZG
-	RkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExM
-	TExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFS
-	UlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dX
-	V1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0ND
-	Q0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJ
-	SUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5O
-	Tk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRU
-	VFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpa
-	WlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVF
-	RkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tL
-	S0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFR
-	UVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZX
-	V1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJC
-	QkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhI
-	SEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5O
-	Tk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NT
-	U1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZ
-	WVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVF
-	RUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpK
-	S0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQ
-	UFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZW
-	VlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFC
-	QkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dH
-	R0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1N
-	TU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNT
-	U1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhY
-	WFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERE
-	REREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpK
-	SkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09P
-	UFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVV
-	VVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFB
-	QUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZH
-	R0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExM
-	TExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJS
-	UlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hY
-	WFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0ND
-	Q0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJ
-	SUlJSUpKSkpKSkpKSko=
-	--------------------------------
-	.
+	<upload crlf="yes">
+	Content-Type: multipart/mixed; boundary=----------------------------
+	Mime-Version: 1.0
+
+	------------------------------
+	Content-Disposition: attachment; filename="myfile.jpg"
+	Content-Type: image/jpeg
+	Content-Transfer-Encoding: base64
+
+	QUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZG
+	RkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExM
+	TExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFS
+	UlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dX
+	V1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0ND
+	Q0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJ
+	SUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5O
+	Tk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRU
+	VFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpa
+	WlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVF
+	RkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tL
+	S0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFR
+	UVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZX
+	V1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJC
+	QkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhI
+	SEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5O
+	Tk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NT
+	U1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZ
+	WVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVF
+	RUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpK
+	S0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQ
+	UFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZW
+	VlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFC
+	QkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dH
+	R0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1N
+	TU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNT
+	U1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhY
+	WFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERE
+	REREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpK
+	SkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09P
+	UFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVV
+	VVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFB
+	QUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZH
+	R0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExM
+	TExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJS
+	UlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hY
+	WFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0ND
+	Q0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJ
+	SUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09P
+	T09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRU
+	VVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpa
+	WlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZG
+	RkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tM
+	TExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFR
+	UVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dX
+	V1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkND
+	Q0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhI
+	SElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5O
+	Tk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRU
+	VFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZ
+	WlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVF
+	RUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tL
+	S0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBR
+	UVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZW
+	VlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJC
+	QkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hI
+	SEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1N
+	TU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NT
+	U1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZ
+	WVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERE
+	RUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpK
+	SkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQ
+	UFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVW
+	VlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFB
+	QUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dH
+	R0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1N
+	TU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJS
+	UlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhY
+	WFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERE
+	REREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJ
+	SkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09P
+	T09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVV
+	VVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpB
+	QUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZG
+	RkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExM
+	TExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJS
+	UlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dX
+	V1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0ND
+	Q0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJ
+	SUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5O
+	T09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRU
+	VFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpa
+	WlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVG
+	RkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tL
+	S0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFR
+	UVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldX
+	V1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJC
+	QkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhI
+	SEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5O
+	Tk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NT
+	VFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZ
+	WVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVF
+	RUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpL
+	S0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQ
+	UFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZW
+	VlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJC
+	QkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dH
+	R0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1N
+	TU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NT
+	U1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhY
+	WVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERE
+	RERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpK
+	SkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09Q
+	UFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVV
+	VVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFB
+	QUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdH
+	R0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExM
+	TE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJS
+	UlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhY
+	WFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0ND
+	REREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJ
+	SUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09P
+	T09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRV
+	VVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpa
+	WlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZG
+	RkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xM
+	TExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFR
+	UVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dX
+	V1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0ND
+	Q0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhI
+	SUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5O
+	Tk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRU
+	VFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVla
+	WlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVF
+	RUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tL
+	S0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFR
+	UVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZW
+	VldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJC
+	QkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhI
+	SEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1N
+	Tk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NT
+	U1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZ
+	WVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERF
+	RUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpK
+	SkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQ
+	UFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZW
+	VlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFB
+	QUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dH
+	R0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1N
+	TU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJS
+	U1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhY
+	WFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERE
+	RERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlK
+	SkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09P
+	T09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVV
+	VVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFB
+	QUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZG
+	RkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExM
+	TExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJS
+	UlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dX
+	WFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0ND
+	Q0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJ
+	SUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5P
+	T09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRU
+	VFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpa
+	WlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZG
+	RkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tL
+	S0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFR
+	UVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dX
+	V1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJC
+	Q0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhI
+	SEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5O
+	Tk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NU
+	VFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZ
+	WVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVF
+	RUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktL
+	S0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQ
+	UFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZW
+	VlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJC
+	QkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dH
+	SEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1N
+	TU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NT
+	U1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZ
+	WVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERE
+	RERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpK
+	SkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQ
+	UFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVV
+	VVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFB
+	QUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dH
+	R0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExM
+	TU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJS
+	UlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhY
+	WFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NE
+	RERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJ
+	SUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09P
+	T09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVV
+	VVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpa
+	WkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZG
+	RkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExM
+	TExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFR
+	UlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dX
+	V1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0ND
+	Q0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJ
+	SUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5O
+	Tk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRU
+	VFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpa
+	WlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVF
+	RUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tL
+	S0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFR
+	UVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZW
+	V1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJC
+	QkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhI
+	SEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1O
+	Tk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NT
+	U1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZ
+	WVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVF
+	RUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpK
+	SktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQ
+	UFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZW
+	VlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFB
+	QkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dH
+	R0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1N
+	TU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJT
+	U1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhY
+	WFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERE
+	RERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpK
+	SkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09P
+	T1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVV
+	VVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFB
+	QUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZG
+	R0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExM
+	TExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJS
+	UlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dY
+	WFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0ND
+	Q0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJ
+	SUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9P
+	T09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRU
+	VFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpa
+	WlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZG
+	RkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tL
+	TExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFR
+	UVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dX
+	V1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJD
+	Q0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhI
+	SEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5O
+	Tk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RU
+	VFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZ
+	WVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVF
+	RUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tL
+	S0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQ
+	UVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZW
+	VlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJC
+	QkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dI
+	SEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1N
+	TU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NT
+	U1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZ
+	WVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERERERE
+	REVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpK
+	SkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQ
+	UFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVV
+	VlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFB
+	QUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dH
+	R0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExN
+	TU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJS
+	UlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhY
+	WFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RE
+	RERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJ
+	SUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09P
+	T09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVV
+	VVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpa
+	QUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZG
+	RkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExM
+	TExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFS
+	UlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dX
+	V1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0ND
+	Q0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJ
+	SUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5O
+	Tk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRU
+	VFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpa
+	WlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVF
+	RkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tL
+	S0tLTExMTExMTExMTE1NTU1NTU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFR
+	UVFRUVFRUlJSUlJSUlJSUlNTU1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZX
+	V1dXV1dXV1dXWFhYWFhYWFhYWFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJC
+	QkJDQ0NDQ0NDQ0NDREREREREREREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhI
+	SEhISEhJSUlJSUlJSUlJSkpKSkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5O
+	Tk5OTk5OTk5PT09PT09PT09PUFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NT
+	U1RUVFRUVFRUVFRVVVVVVVVVVVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZ
+	WVlZWVpaWlpaWlpaWlpBQUFBQUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVF
+	RUVFRUVFRUZGRkZGRkZGRkZHR0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpK
+	S0tLS0tLS0tLS0xMTExMTExMTExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQ
+	UFBQUVFRUVFRUVFRUVJSUlJSUlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZW
+	VlZWVlZWV1dXV1dXV1dXV1hYWFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFC
+	QkJCQkJCQkJCQ0NDQ0NDQ0NDQ0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dH
+	R0dISEhISEhISEhISUlJSUlJSUlJSUpKSkpKSkpKSkpLS0tLS0tLS0tLTExMTExMTExMTE1NTU1N
+	TU1NTU1OTk5OTk5OTk5OT09PT09PT09PT1BQUFBQUFBQUFBRUVFRUVFRUVFRUlJSUlJSUlJSUlNT
+	U1NTU1NTU1NUVFRUVFRUVFRUVVVVVVVVVVVVVVZWVlZWVlZWVlZXV1dXV1dXV1dXWFhYWFhYWFhY
+	WFlZWVlZWVlZWVlaWlpaWlpaWlpaQUFBQUFBQUFBQUJCQkJCQkJCQkJDQ0NDQ0NDQ0NDRERERERE
+	REREREVFRUVFRUVFRUVGRkZGRkZGRkZGR0dHR0dHR0dHR0hISEhISEhISEhJSUlJSUlJSUlJSkpK
+	SkpKSkpKSktLS0tLS0tLS0tMTExMTExMTExMTU1NTU1NTU1NTU5OTk5OTk5OTk5PT09PT09PT09P
+	UFBQUFBQUFBQUFFRUVFRUVFRUVFSUlJSUlJSUlJSU1NTU1NTU1NTU1RUVFRUVFRUVFRVVVVVVVVV
+	VVVVVlZWVlZWVlZWVldXV1dXV1dXV1dYWFhYWFhYWFhYWVlZWVlZWVlZWVpaWlpaWlpaWlpBQUFB
+	QUFBQUFBQkJCQkJCQkJCQkNDQ0NDQ0NDQ0NERERERERERERERUVFRUVFRUVFRUZGRkZGRkZGRkZH
+	R0dHR0dHR0dHSEhISEhISEhISElJSUlJSUlJSUlKSkpKSkpKSkpKS0tLS0tLS0tLS0xMTExMTExM
+	TExNTU1NTU1NTU1NTk5OTk5OTk5OTk9PT09PT09PT09QUFBQUFBQUFBQUVFRUVFRUVFRUVJSUlJS
+	UlJSUlJTU1NTU1NTU1NTVFRUVFRUVFRUVFVVVVVVVVVVVVVWVlZWVlZWVlZWV1dXV1dXV1dXV1hY
+	WFhYWFhYWFhZWVlZWVlZWVlZWlpaWlpaWlpaWkFBQUFBQUFBQUFCQkJCQkJCQkJCQ0NDQ0NDQ0ND
+	Q0RERERERERERERFRUVFRUVFRUVFRkZGRkZGRkZGRkdHR0dHR0dHR0dISEhISEhISEhISUlJSUlJ
+	SUlJSUpKSkpKSkpKSko=
+	--------------------------------
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test653+23 -23

@@ -68,29 +68,29 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
	# Note that the stripping above removes 12 bytes from every occurrence of the
	# boundary string and since 5 of them are in the body contents, we see
	# (5*12) == 60 bytes less
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 162
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="name"
-
-	short value
-	--------------------------------
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 179
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="name"
-
-	long value for length change
-	--------------------------------
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 162
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="name"
+
+	short value
+	--------------------------------
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 179
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="name"
+
+	long value for length change
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test658+5 -5

@@ -38,11 +38,11 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>

tests/data/test659+6 -6

@@ -42,12 +42,12 @@ proxy
	</client>

	<verify>
-	<protocol>
-	GET http://www.example.com/ HTTP/1.1
-	Host: www.example.com
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://www.example.com/ HTTP/1.1
+	Host: www.example.com
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>

tests/data/test66+6 -6

@@ -29,12 +29,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http0.9
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test660+2 -2

@@ -27,8 +27,8 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
+	<protocol crlf="yes">
+	A001 CAPABILITY
	</protocol>
	</verify>
	</testcase>

tests/data/test661+35 -35

@@ -33,41 +33,41 @@ ftp://%HOSTIP:%FTPPORT/
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD /folderA
-	EPSV
-	TYPE I
-	RETR %TESTNUMBER
-	CWD /folderB
-	EPSV
-	RETR %TESTNUMBER
-	QUIT
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	RETR /folderA/%TESTNUMBER
-	CWD /folderB
-	EPSV
-	RETR %TESTNUMBER
-	EPSV
-	RETR /folderA/%TESTNUMBER
-	QUIT
-	USER anonymous
-	PASS [email protected]
-	PWD
-	SYST
-	QUIT
-	USER anonymous
-	PASS [email protected]
-	PWD
-	SYST
-	SYST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD /folderA
+	EPSV
+	TYPE I
+	RETR %TESTNUMBER
+	CWD /folderB
+	EPSV
+	RETR %TESTNUMBER
+	QUIT
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	RETR /folderA/%TESTNUMBER
+	CWD /folderB
+	EPSV
+	RETR %TESTNUMBER
+	EPSV
+	RETR /folderA/%TESTNUMBER
+	QUIT
+	USER anonymous
+	PASS [email protected]
+	PWD
+	SYST
+	QUIT
+	USER anonymous
+	PASS [email protected]
+	PWD
+	SYST
+	SYST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test662+13 -13

@@ -60,19 +60,19 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://example.com/please/gimme/%TESTNUMBER HTTP/1.1
-	Host: example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://example.net/tes%20t%20case=/%TESTNUMBER0002 HTTP/1.1
-	Host: example.net
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://example.com/please/gimme/%TESTNUMBER HTTP/1.1
+	Host: example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://example.net/tes%20t%20case=/%TESTNUMBER0002 HTTP/1.1
+	Host: example.net
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test663+13 -13

@@ -64,19 +64,19 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://example.com/gimme/%TESTNUMBER?foobar HTTP/1.1
-	Host: example.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://example.net/there/tes%20t%20case=/%TESTNUMBER0002?+yes+no HTTP/1.1
-	Host: example.net
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://example.com/gimme/%TESTNUMBER?foobar HTTP/1.1
+	Host: example.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://example.net/there/tes%20t%20case=/%TESTNUMBER0002?+yes+no HTTP/1.1
+	Host: example.net
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test667+22 -22

@@ -61,28 +61,28 @@ s/boundary=------------------------[A-Za-z0-9]*/boundary=-----------------------
	# Note that the stripping above removes 12 bytes from every occurrence of the
	# boundary string and since 5 of them are in the body contents, we see
	# (5*12) == 60 bytes less
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Transfer-Encoding: chunked
-	Content-Type: multipart/form-data; boundary=----------------------------
-	Expect: 100-continue
-
-	85
-	------------------------------
-	Content-Disposition: form-data; name="field"
-	Content-Transfer-Encoding: base64
-
-
-	4
-	ZHVt
-	3a
-	bXk=
-	--------------------------------
-
-	0
-
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Transfer-Encoding: chunked
+	Content-Type: multipart/form-data; boundary=----------------------------
+	Expect: 100-continue
+
+	85
+	------------------------------
+	Content-Disposition: form-data; name="field"
+	Content-Transfer-Encoding: base64
+
+
+	4
+	ZHVt
+	3a
+	bXk=
+	--------------------------------
+
+	0
+
	</protocol>
	</verify>
	</testcase>

tests/data/test669+17 -17

@@ -41,23 +41,23 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -H 'Content-type: multipart/form-da
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	POST /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Content-Length: 260
-	Content-Type: multipart/form-data; charset=utf-8; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="name"
-
-	daniel
-	------------------------------
-	Content-Disposition: form-data; name="tool"
-
-	curl
-	--------------------------------
+	<protocol crlf="yes">
+	POST /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 260
+	Content-Type: multipart/form-data; charset=utf-8; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="name"
+
+	daniel
+	------------------------------
+	Content-Disposition: form-data; name="tool"
+
+	curl
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test67+13 -13

@@ -73,19 +73,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test670+12 -12

@@ -58,18 +58,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 154
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="field"
-
-	AB
-	--------------------------------
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 154
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="field"
+
+	AB
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test671+12 -12

@@ -58,18 +58,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 154
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="field"
-
-	AB
-	--------------------------------
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 154
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="field"
+
+	AB
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test672+12 -12

@@ -58,18 +58,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 154
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="field"
-
-	AB
-	--------------------------------
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 154
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="field"
+
+	AB
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test673+12 -12

@@ -58,18 +58,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	POST /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 154
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="field"
-
-	AB
-	--------------------------------
+	<protocol crlf="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 154
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="field"
+
+	AB
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test674+9 -9

@@ -39,15 +39,15 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+
	</protocol>
	</verify>

tests/data/test675+13 -13

@@ -37,19 +37,19 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /user1/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user1:foo1]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /user2/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user2:foo2]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /user1/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user1:foo1]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /user2/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user2:foo2]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test676+12 -12

@@ -69,18 +69,18 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: the-moo agent next generation
-	Accept: /
-	Cookie: proven=yes
-
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: the-moo agent next generation
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: the-moo agent next generation
+	Accept: /
+	Cookie: proven=yes
+
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: the-moo agent next generation
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test677+3 -3

@@ -35,9 +35,9 @@ imap://%HOSTIP:%IMAPPORT/677
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A1 IDLE
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A1 IDLE
	</protocol>
	</verify>
	</testcase>

tests/data/test678+6 -6

@@ -48,12 +48,12 @@ https://localhost:%HTTPSPORT/%TESTNUMBER %CERTDIR/certs/test-ca.crt
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: localhost:%HTTPSPORT
-	User-Agent: CURLOPT_CAINFO_BLOB
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: localhost:%HTTPSPORT
+	User-Agent: CURLOPT_CAINFO_BLOB
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test679+7 -7

@@ -44,13 +44,13 @@ machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET / HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user1:with%20spaces%20and%20"%0a%0d%09a]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET / HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user1:with%20spaces%20and%20"%0a%0d%09a]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test68+13 -13

@@ -72,19 +72,19 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test681+6 -6

@@ -37,12 +37,12 @@ http
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	-foo-

tests/data/test682+7 -7

@@ -41,13 +41,13 @@ machine %HOSTIP login user2 password passwd2
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET / HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user1:passwd1]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET / HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user1:passwd1]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test683+7 -7

@@ -41,13 +41,13 @@ machine %HOSTIP login user2 password passwd2
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET / HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user2:passwd2]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET / HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user2:passwd2]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test684+7 -7

@@ -40,13 +40,13 @@ machine %HOSTIP password 5up3r53cr37
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET / HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[:5up3r53cr37]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET / HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[:5up3r53cr37]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test685+7 -7

@@ -40,13 +40,13 @@ machine %HOSTIP password 5up3r53cr37
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
+	<protocol crlf="yes">
+	GET / HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[user:5up3r53cr37]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
-	GET / HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[user:5up3r53cr37]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
	</verify>
	</testcase>

tests/data/test687+6 -6

@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -o %LOGDIR/out%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout mode="text">
	user.creator => curl

tests/data/test688+6 -6

@@ -47,12 +47,12 @@ basic --xattr with -O
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout mode="text">
	user.creator => curl

tests/data/test689+6 -6

@@ -37,12 +37,12 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol>
-	OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
-	CSeq: 1
-	User-Agent: test567
-	Test-Number: 567
-
+	<protocol crlf="yes">
+	OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
+	CSeq: 1
+	User-Agent: test567
+	Test-Number: 567
+
	</protocol>
	# 85 == CURLE_RTSP_CSEQ_ERROR
	<errorcode>

tests/data/test69+18 -18

@@ -89,24 +89,24 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test693+6 -6

@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/moo/boo/etag%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/moo/boo/etag%TESTNUMBER">
	W/"asdf"

tests/data/test695+31 -31

@@ -42,37 +42,37 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	POST /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 196
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="data"
-	Content-Type: text/html
-
-	<title>hello</title>
-	--------------------------------
-	POST /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 423
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data
-	Content-Type: multipart/mixed; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: attachment; name="data"
-	Content-Type: text/html
-
-	<title>hello</title>
-	--------------------------------
-
-	--------------------------------
+	<protocol crlf="yes">
+	POST /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 196
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="data"
+	Content-Type: text/html
+
+	<title>hello</title>
+	--------------------------------
+	POST /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 423
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data
+	Content-Type: multipart/mixed; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: attachment; name="data"
+	Content-Type: text/html
+
+	<title>hello</title>
+	--------------------------------
+
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test696+7 -7

@@ -54,13 +54,13 @@ Connection: close

	-foo-
	</stdout>
-	<protocol>
-	GET /556 HTTP/1.1
-	Host: ninja
-
-	GET /556 HTTP/1.1
-	Host: ninja
-
+	<protocol crlf="yes">
+	GET /556 HTTP/1.1
+	Host: ninja
+
+	GET /556 HTTP/1.1
+	Host: ninja
+
	</protocol>

	<errorcode>

tests/data/test698+13 -13

@@ -37,19 +37,19 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --ftp-account "one count" ftp://%HOSTIP:%FTPP

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	ACCT one count
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	EPSV
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	ACCT one count
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	EPSV
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test7+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -D %LOGDIR/heads%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/heads%TESTNUMBER.txt">
	HTTP/1.1 200 OK

tests/data/test70+12 -12

@@ -69,18 +69,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="2c9a6f00af0d86497b177b90e90c688a"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="2c9a6f00af0d86497b177b90e90c688a"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test700+6 -6

@@ -47,12 +47,12 @@ HTTP GET via SOCKS4 proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test701+6 -6

@@ -47,12 +47,12 @@ HTTP GET via SOCKS5 proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test706+8 -8

@@ -47,14 +47,14 @@ FTP dir list PASV via SOCKS4
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test707+8 -8

@@ -47,14 +47,14 @@ FTP dir list PASV via SOCKS5
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE A
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE A
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test708+6 -6

@@ -50,12 +50,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test709+6 -6

@@ -51,12 +51,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test710+6 -6

@@ -47,12 +47,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test711+9 -9

@@ -43,15 +43,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test712+9 -9

@@ -37,15 +37,15 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --proxy socks5://%HOSTIP:%SOCKSPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test713+9 -9

@@ -38,15 +38,15 @@ ftp://ftp.example.com/%TESTNUMBER --connect-to ::%HOSTIP:%FTPPORT --proxy socks5
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test714+9 -9

@@ -57,15 +57,15 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test715+9 -9

@@ -59,15 +59,15 @@ ftp://ftp.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.com
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test717+6 -6

@@ -55,12 +55,12 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:1
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:1
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test718+6 -6

@@ -47,12 +47,12 @@ http://test.remote.haxx.se.%TESTNUMBER:8990/path/%TESTNUMBER0002 --proxy http://

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
-	Host: test.remote.haxx.se.%TESTNUMBER:8990
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
+	Host: test.remote.haxx.se.%TESTNUMBER:8990
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	<errorcode>
	56

tests/data/test719+6 -6

@@ -49,12 +49,12 @@ http://[2200::33]:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: [2200::33]:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: [2200::33]:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<socks>
	atyp 4 => 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00 33

tests/data/test72+12 -12

@@ -68,18 +68,18 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="9fcd1330377365a09bbcb33b2cbb25bd"
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Digest username="testuser", realm="testrealm", nonce="1053604199", uri="/%TESTNUMBER", response="9fcd1330377365a09bbcb33b2cbb25bd"
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test720+6 -6

@@ -48,12 +48,12 @@ http://12.34.56.78:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: 12.34.56.78:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: 12.34.56.78:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<socks>
	atyp 1 => 12.34.56.78

tests/data/test721+6 -6

@@ -48,12 +48,12 @@ http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCK
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: this.is.a.host.name:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: this.is.a.host.name:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<socks>
	atyp 3 => this.is.a.host.name

tests/data/test73+6 -6

@@ -38,12 +38,12 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: host.NOT_DISCLOSED.se
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: host.NOT_DISCLOSED.se
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
	# Netscape HTTP Cookie File

tests/data/test74+11 -11

@@ -50,17 +50,17 @@ HTTP, urlglob {}-retrieval and -o #[num] usage
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/dumpit%TESTNUMBER0001.dump">
	HTTP/1.0 200 OK

tests/data/test742+6 -6

@@ -55,12 +55,12 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET / HTTP/1.1
-	Host: %repeat[254 x c]%:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET / HTTP/1.1
+	Host: %repeat[254 x c]%:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test744+6 -6

@@ -68,12 +68,12 @@ Host: foo.host:%HTTPPORT
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: foo.host:%HTTPPORT
-	Authorization: Basic %b64[foo:baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar]b64%
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: foo.host:%HTTPPORT
+	Authorization: Basic %b64[foo:baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar]b64%
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test753+10 -10

@@ -30,16 +30,16 @@ CURL_FTP_PWD_STOP=1

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	USER anonymous
-	PASS [email protected]
-	PWD
-	EPSV
-	TYPE I
-	SIZE 753
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	USER anonymous
+	PASS [email protected]
+	PWD
+	EPSV
+	TYPE I
+	SIZE 753
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test754+14 -14

@@ -42,20 +42,20 @@ ftp://%HOSTIP:%FTPPORT/path/ -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	USER anonymous
-	PASS [email protected]
-	PWD
-	NOOP 1
-	FAIL
-	CWD path
-	EPSV
-	TYPE A
-	NOOP 2
-	FAIL HARD
-	LIST
-	NOOP 3
-	QUIT
+	<protocol crlf="yes">
+	USER anonymous
+	PASS [email protected]
+	PWD
+	NOOP 1
+	FAIL
+	CWD path
+	EPSV
+	TYPE A
+	NOOP 2
+	FAIL HARD
+	LIST
+	NOOP 3
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test756+11 -11

@@ -47,17 +47,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUM

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /want/%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /want/%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<stdout>
	HTTP/1.1 200 OK

tests/data/test757+31 -31

@@ -42,37 +42,37 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
	s/^--------------------------[A-Za-z0-9]*/------------------------------/
	s/boundary=------------------------[A-Za-z0-9]*/boundary=----------------------------/
	</strippart>
-	<protocol>
-	POST /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 200
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data; name="data"
-	Content-Type: text/html
-
-	<title>fun-times</title>
-	--------------------------------
-	POST /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Accept: /
-	Content-Length: 427
-	Content-Type: multipart/form-data; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: form-data
-	Content-Type: multipart/mixed; boundary=----------------------------
-
-	------------------------------
-	Content-Disposition: attachment; name="data"
-	Content-Type: text/html
-
-	<title>fun-times</title>
-	--------------------------------
-
-	--------------------------------
+	<protocol crlf="yes">
+	POST /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 200
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data; name="data"
+	Content-Type: text/html
+
+	<title>fun-times</title>
+	--------------------------------
+	POST /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Accept: /
+	Content-Length: 427
+	Content-Type: multipart/form-data; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: form-data
+	Content-Type: multipart/mixed; boundary=----------------------------
+
+	------------------------------
+	Content-Disposition: attachment; name="data"
+	Content-Type: text/html
+
+	<title>fun-times</title>
+	--------------------------------
+
+	--------------------------------
	</protocol>
	</verify>
	</testcase>

tests/data/test762+6 -6

@@ -38,12 +38,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<file name="%LOGDIR/%TESTNUMBER">
	12345

tests/data/test77+7 -7

@@ -42,13 +42,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-Modified-Since: Sun, 12 Dec 1999 12:00:00 GMT
+
	</protocol>
	</verify>
	</testcase>

tests/data/test775+7 -7

@@ -52,13 +52,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser%repeat[1100 x A]%:testpass --nt

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	<errorcode>
	100

tests/data/test78+7 -7

@@ -54,13 +54,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
+
	</protocol>
	</verify>
	</testcase>

tests/data/test79+7 -7

@@ -42,13 +42,13 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test794+1 -1

@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-progress-meter -X IGLOO -d moo --locat
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	IGLOO /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test796+1 -1

@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -X IGLOO -d moo --follow
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	IGLOO /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test797+1 -1

@@ -75,7 +75,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -X IGLOO -d moo --follow
	<strip>
	^User-Agent:.*
	</strip>
-	<protocol nonewline="yes" crlf="yes">
+	<protocol crlf="yes" nonewline="yes">
	IGLOO /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test799+6 -6

@@ -42,12 +42,12 @@ IMAP with --login-options 'AUTH=+LOGIN'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test8+7 -7

@@ -88,13 +88,13 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /we/want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Cookie: name with space=is weird but; trailingspace=removed; cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes; cookie9=junk--
-
+	<protocol crlf="yes">
+	GET /we/want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Cookie: name with space=is weird but; trailingspace=removed; cookie=perhaps; cookie=yes; foobar=name; blexp=yesyes; cookie9=junk--
+
	</protocol>
	</verify>
	</testcase>

tests/data/test80+6 -6

@@ -70,12 +70,12 @@ Proxy-Authorization: Basic %b64[youare:yourself]b64%
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	Authorization: Basic %b64[iam:myself]b64%
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	Authorization: Basic %b64[iam:myself]b64%
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test800+6 -6

@@ -38,12 +38,12 @@ IMAP FETCH message
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN "\"user" "sec\"ret{"
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN "\"user" "sec\"ret{"
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test801+6 -6

@@ -35,12 +35,12 @@ IMAP FETCH message by MAILINDEX and SECTION
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 123 BODY[1]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 123 BODY[1]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test802+6 -6

@@ -36,12 +36,12 @@ IMAP SELECT UIDVALIDITY Success
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 123 BODY[TEXT]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 123 BODY[TEXT]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test803+5 -5

@@ -35,11 +35,11 @@ IMAP SELECT UIDVALIDITY Failure
	<errorcode>
	78
	</errorcode>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test804+7 -7

@@ -35,13 +35,13 @@ IMAP doesn't perform SELECT if reusing the same mailbox
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 123 BODY[1]
-	A005 FETCH 456 BODY[2.3]
-	A006 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 123 BODY[1]
+	A005 FETCH 456 BODY[2.3]
+	A006 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test805+15 -15

@@ -41,22 +41,22 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 APPEND %TESTNUMBER (\Seen) {295}
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 APPEND %TESTNUMBER (\Seen) {295}
+	A004 LOGOUT
	</protocol>
-	<upload>
-	Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
-	From: Fred Foobar <[email protected]>
-	Subject: afternoon meeting
-	To: [email protected]
-	Message-Id: <[email protected]>
-	MIME-Version: 1.0
-	Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
-
-	Hello Joe, do you think we can meet at 3:30 tomorrow?
+	<upload crlf="yes">
+	Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
+	From: Fred Foobar <[email protected]>
+	Subject: afternoon meeting
+	To: [email protected]
+	Message-Id: <[email protected]>
+	MIME-Version: 1.0
+	Content-Type: TEXT/PLAIN; CHARSET=US-ASCII
+
+	Hello Joe, do you think we can meet at 3:30 tomorrow?
	</upload>
	</verify>
	</testcase>

tests/data/test806+5 -5

@@ -34,11 +34,11 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 LIST "%TESTNUMBER" *
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 LIST "%TESTNUMBER" *
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test807+5 -5

@@ -35,11 +35,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'LSUB "%TESTNUMBER" *'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 LSUB "%TESTNUMBER" *
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 LSUB "%TESTNUMBER" *
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test808+5 -5

@@ -39,11 +39,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'EXAMINE %TESTNUMBER'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 EXAMINE %TESTNUMBER
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 EXAMINE %TESTNUMBER
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test809+5 -5

@@ -33,11 +33,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'STATUS %TESTNUMBER (UIDNEXT MESSAGES
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 STATUS %TESTNUMBER (UIDNEXT MESSAGES)
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 STATUS %TESTNUMBER (UIDNEXT MESSAGES)
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test81+15 -15

@@ -73,21 +73,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%H

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test810+6 -6

@@ -32,12 +32,12 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER?NEW -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 SEARCH NEW
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 SEARCH NEW
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test811+5 -5

@@ -30,11 +30,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'CREATE %TESTNUMBER'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 CREATE %TESTNUMBER
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 CREATE %TESTNUMBER
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test812+5 -5

@@ -30,11 +30,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'DELETE %TESTNUMBER'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 DELETE %TESTNUMBER
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 DELETE %TESTNUMBER
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test813+5 -5

@@ -30,11 +30,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'RENAME 666 %TESTNUMBER'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 RENAME 666 %TESTNUMBER
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 RENAME 666 %TESTNUMBER
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test814+6 -6

@@ -30,12 +30,12 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -u user:secret -X 'CHECK'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 CHECK
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 CHECK
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test815+7 -7

@@ -34,13 +34,13 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 STORE 123 +Flags \Deleted
-	A005 CLOSE
-	A006 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 STORE 123 +Flags \Deleted
+	A005 CLOSE
+	A006 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test816+7 -7

@@ -37,13 +37,13 @@ imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -X 'STORE 123 +Flags \Deleted' -u user:secr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 STORE 123 +Flags \Deleted
-	A005 EXPUNGE
-	A006 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 STORE 123 +Flags \Deleted
+	A005 EXPUNGE
+	A006 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test817+5 -5

@@ -30,11 +30,11 @@ imap://%HOSTIP:%IMAPPORT -u user:secret -X 'COPY 123 %TESTNUMBER'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 COPY 123 %TESTNUMBER
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 COPY 123 %TESTNUMBER
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test818+5 -5

@@ -36,11 +36,11 @@ imap://%HOSTIP:%IMAPPORT -X NOOP -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 NOOP
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 NOOP
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test819+7 -7

@@ -44,13 +44,13 @@ IMAP plain authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE PLAIN
-	AHVzZXIAc2VjcmV0
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE PLAIN
+	AHVzZXIAc2VjcmV0
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test82+8 -8

@@ -41,14 +41,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%H

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: Basic %b64[testuser:testpass]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: Basic %b64[testuser:testpass]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test820+8 -8

@@ -44,14 +44,14 @@ IMAP login authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE LOGIN
-	dXNlcg==
-	c2VjcmV0
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE LOGIN
+	dXNlcg==
+	c2VjcmV0
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test821+7 -7

@@ -48,13 +48,13 @@ IMAP CRAM-MD5 authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE CRAM-MD5
-	dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE CRAM-MD5
+	dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test822+8 -8

@@ -50,14 +50,14 @@ IMAP NTLM authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE NTLM
-	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE NTLM
+	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test823+8 -8

@@ -54,14 +54,14 @@ IMAP DIGEST-MD5 authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE DIGEST-MD5
-	dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJpbWFwLzEyNy4wLjAuMSIscmVzcG9uc2U9YmU2MzgyNDkzNjJkN2FhMGUzNTM4NTA3Njc1MWFiNDgscW9wPWF1dGg=
-
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE DIGEST-MD5
+	dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJpbWFwLzEyNy4wLjAuMSIscmVzcG9uc2U9YmU2MzgyNDkzNjJkN2FhMGUzNTM4NTA3Njc1MWFiNDgscW9wPWF1dGg=
+
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test824+7 -7

@@ -44,13 +44,13 @@ IMAP OAuth 2.0 (XOAUTH2) authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE XOAUTH2
-	dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE XOAUTH2
+	dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test825+6 -6

@@ -45,12 +45,12 @@ IMAP plain authentication with initial response
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE PLAIN AHVzZXIAc2VjcmV0
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE PLAIN AHVzZXIAc2VjcmV0
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test826+7 -7

@@ -45,13 +45,13 @@ IMAP login authentication with initial response
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE LOGIN dXNlcg==
-	c2VjcmV0
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE LOGIN dXNlcg==
+	c2VjcmV0
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test827+7 -7

@@ -51,13 +51,13 @@ IMAP NTLM authentication with initial response
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test828+6 -6

@@ -45,12 +45,12 @@ IMAP OAuth 2.0 (XOAUTH2) authentication with initial response
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test83+7 -7

@@ -67,13 +67,13 @@ User-Agent: curl/%VERSION
	Proxy-Connection: Keep-Alive

	</proxy>
-	<protocol>
-	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	Authorization: Basic %b64[iam:my:;self]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	Authorization: Basic %b64[iam:my:;self]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test830+4 -4

@@ -48,10 +48,10 @@ IMAP CRAM-MD5 graceful cancellation
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE CRAM-MD5
-	*
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE CRAM-MD5
+	*
	</protocol>
	</verify>
	</testcase>

tests/data/test831+5 -5

@@ -49,11 +49,11 @@ IMAP NTLM graceful cancellation
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE NTLM
-	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	*
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE NTLM
+	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	*
	</protocol>
	</verify>
	</testcase>

tests/data/test832+4 -4

@@ -50,10 +50,10 @@ IMAP DIGEST-MD5 graceful cancellation
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE DIGEST-MD5
-	*
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE DIGEST-MD5
+	*
	</protocol>
	</verify>
	</testcase>

tests/data/test833+9 -9

@@ -52,15 +52,15 @@ IMAP CRAM-MD5 authentication with SASL downgrade
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE CRAM-MD5
-	*
-	A003 AUTHENTICATE PLAIN
-	AHVzZXIAc2VjcmV0
-	A004 SELECT %TESTNUMBER
-	A005 FETCH 1 BODY[]
-	A006 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE CRAM-MD5
+	*
+	A003 AUTHENTICATE PLAIN
+	AHVzZXIAc2VjcmV0
+	A004 SELECT %TESTNUMBER
+	A005 FETCH 1 BODY[]
+	A006 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test834+10 -10

@@ -53,16 +53,16 @@ IMAP NTLM authentication with SASL downgrade
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE NTLM
-	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	*
-	A003 AUTHENTICATE PLAIN
-	AHVzZXIAc2VjcmV0
-	A004 SELECT %TESTNUMBER
-	A005 FETCH 1 BODY[]
-	A006 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE NTLM
+	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	*
+	A003 AUTHENTICATE PLAIN
+	AHVzZXIAc2VjcmV0
+	A004 SELECT %TESTNUMBER
+	A005 FETCH 1 BODY[]
+	A006 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test835+9 -9

@@ -54,15 +54,15 @@ IMAP DIGEST-MD5 authentication with SASL downgrade
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE DIGEST-MD5
-	*
-	A003 AUTHENTICATE PLAIN
-	AHVzZXIAc2VjcmV0
-	A004 SELECT %TESTNUMBER
-	A005 FETCH 1 BODY[]
-	A006 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE DIGEST-MD5
+	*
+	A003 AUTHENTICATE PLAIN
+	AHVzZXIAc2VjcmV0
+	A004 SELECT %TESTNUMBER
+	A005 FETCH 1 BODY[]
+	A006 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test836+11 -11

@@ -43,17 +43,17 @@ IMAP multiple connection authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user.one secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
-	B001 CAPABILITY
-	B002 LOGIN user.two secret
-	B003 SELECT %TESTNUMBER
-	B004 FETCH 2 BODY[]
-	B005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user.one secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
+	B001 CAPABILITY
+	B002 LOGIN user.two secret
+	B003 SELECT %TESTNUMBER
+	B004 FETCH 2 BODY[]
+	B005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test837+7 -7

@@ -44,13 +44,13 @@ IMAP external authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE EXTERNAL
-	dXNlcg==
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE EXTERNAL
+	dXNlcg==
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test838+7 -7

@@ -44,13 +44,13 @@ IMAP external authentication without credentials
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE EXTERNAL
-	=
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE EXTERNAL
+	=
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test839+6 -6

@@ -45,12 +45,12 @@ IMAP external authentication with initial response
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE EXTERNAL dXNlcg==
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE EXTERNAL dXNlcg==
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test84+8 -8

@@ -41,14 +41,14 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[iam:myself]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[iam:myself]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test840+6 -6

@@ -45,12 +45,12 @@ IMAP external authentication with initial response without credentials
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE EXTERNAL =
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE EXTERNAL =
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test841+6 -6

@@ -45,12 +45,12 @@ IMAP custom request doesn't check continuation data
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 123 BODY[1]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 123 BODY[1]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test842+7 -7

@@ -47,13 +47,13 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE OAUTHBEARER
-	%b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE OAUTHBEARER
+	%b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test843+6 -6

@@ -46,12 +46,12 @@ IMAP OAuth 2.0 (OAUTHBEARER) authentication with initial response
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test844+4 -4

@@ -43,10 +43,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE OAUTHBEARER
-	%b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE OAUTHBEARER
+	%b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
	</protocol>
	</verify>
	</testcase>

tests/data/test845+4 -4

@@ -45,10 +45,10 @@ IMAP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	%b64[%01]b64%
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	%b64[%01]b64%
	</protocol>
	</verify>
	</testcase>

tests/data/test846+5 -5

@@ -40,11 +40,11 @@ IMAP PREAUTH response
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 SELECT %TESTNUMBER
-	A003 FETCH 1 BODY[]
-	A004 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 SELECT %TESTNUMBER
+	A003 FETCH 1 BODY[]
+	A004 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test847+6 -6

@@ -38,12 +38,12 @@ IMAP FETCH message
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN "\"user" "sec\"ret{"
-	A003 SELECT %TESTNUMBER
-	A004 UID FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN "\"user" "sec\"ret{"
+	A003 SELECT %TESTNUMBER
+	A004 UID FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test848+7 -7

@@ -44,13 +44,13 @@ IMAP plain authentication with alternative authorization identity
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE PLAIN
-	c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE PLAIN
+	c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test849+4 -4

@@ -42,10 +42,10 @@ IMAP plain auth with alt authorization identity (Not authorized)
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "LOGOUT"
-	<protocol>
-	A001 CAPABILITY
-	A002 AUTHENTICATE PLAIN
-	dXJzZWwAa3VydAB4aXBqM3BsbXE=
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 AUTHENTICATE PLAIN
+	dXJzZWwAa3VydAB4aXBqM3BsbXE=
	</protocol>
	</verify>
	</testcase>

tests/data/test85+9 -9

@@ -44,15 +44,15 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Proxy-Authorization: Basic %b64[testing:this]b64%
-	Authorization: Basic %b64[iam:myself]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Proxy-Authorization: Basic %b64[testing:this]b64%
+	Authorization: Basic %b64[iam:myself]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test850+6 -6

@@ -38,12 +38,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test851+6 -6

@@ -33,12 +33,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	LIST %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	LIST %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test852+6 -6

@@ -36,12 +36,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	LIST %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	LIST %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test853+6 -6

@@ -42,12 +42,12 @@ pop3://%HOSTIP:%POP3PORT/ -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test854+6 -6

@@ -34,12 +34,12 @@ pop3://%HOSTIP:%POP3PORT/ -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	LIST
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test855+6 -6

@@ -36,12 +36,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test856+4 -4

@@ -39,10 +39,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:wrong
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	CAPA
-	USER user
-	PASS wrong
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS wrong
	</protocol>
	</verify>
	</testcase>

tests/data/test857+6 -6

@@ -49,12 +49,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test858+6 -6

@@ -30,12 +30,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret -X DELE -I
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	DELE %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	DELE %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test859+6 -6

@@ -30,12 +30,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X STAT -I
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	STAT
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	STAT
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test86+16 -16

@@ -64,22 +64,22 @@ HTTP, urlglob []-retrieval and -o #[num] usage
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER0001 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0002 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER0003 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER0001 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0002 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER0003 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	# we check the second file

tests/data/test860+6 -6

@@ -30,12 +30,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X NOOP -I
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	NOOP
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	NOOP
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test861+6 -6

@@ -41,12 +41,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X UIDL
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	UIDL
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	UIDL
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test862+6 -6

@@ -39,12 +39,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X 'TOP %TESTNUMBER 0'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	TOP %TESTNUMBER 0
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	TOP %TESTNUMBER 0
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test863+6 -6

@@ -30,12 +30,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X RSET -I
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	RSET
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	RSET
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test864+5 -5

@@ -45,11 +45,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	APOP user 7501b4cdc224d469940e65e7b5e4d6eb
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	APOP user 7501b4cdc224d469940e65e7b5e4d6eb
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test865+6 -6

@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH PLAIN
-	AHVzZXIAc2VjcmV0
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH PLAIN
+	AHVzZXIAc2VjcmV0
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test866+7 -7

@@ -46,13 +46,13 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH LOGIN
-	dXNlcg==
-	c2VjcmV0
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH LOGIN
+	dXNlcg==
+	c2VjcmV0
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test867+6 -6

@@ -50,12 +50,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH CRAM-MD5
-	dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH CRAM-MD5
+	dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test868+7 -7

@@ -52,13 +52,13 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH NTLM
-	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH NTLM
+	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test869+7 -7

@@ -56,13 +56,13 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH DIGEST-MD5
-	dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvMTI3LjAuMC4xIixyZXNwb25zZT0xODMxNTU0OGM3ZjNhMzdlNzE2ZmE4ZTkwZGZhYjliNixxb3A9YXV0aA==
-
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH DIGEST-MD5
+	dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvMTI3LjAuMC4xIixyZXNwb25zZT0xODMxNTU0OGM3ZjNhMzdlNzE2ZmE4ZTkwZGZhYjliNixxb3A9YXV0aA==
+
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test870+6 -6

@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH XOAUTH2
-	dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH XOAUTH2
+	dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test871+5 -5

@@ -46,11 +46,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH PLAIN AHVzZXIAc2VjcmV0
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH PLAIN AHVzZXIAc2VjcmV0
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test872+6 -6

@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-ir
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH LOGIN dXNlcg==
-	c2VjcmV0
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH LOGIN dXNlcg==
+	c2VjcmV0
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test873+6 -6

@@ -52,12 +52,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass --sasl-ir
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test874+5 -5

@@ -46,11 +46,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test876+4 -4

@@ -49,10 +49,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	CAPA
-	AUTH CRAM-MD5
-	*
+	<protocol crlf="yes">
+	CAPA
+	AUTH CRAM-MD5
+	*
	</protocol>
	</verify>
	</testcase>

tests/data/test877+5 -5

@@ -50,11 +50,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u testuser:testpass
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	CAPA
-	AUTH NTLM
-	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	*
+	<protocol crlf="yes">
+	CAPA
+	AUTH NTLM
+	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	*
	</protocol>
	</verify>
	</testcase>

tests/data/test878+4 -4

@@ -51,10 +51,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	CAPA
-	AUTH DIGEST-MD5
-	*
+	<protocol crlf="yes">
+	CAPA
+	AUTH DIGEST-MD5
+	*
	</protocol>
	</verify>
	</testcase>

tests/data/test879+8 -8

@@ -54,14 +54,14 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH CRAM-MD5
-	*
-	AUTH PLAIN
-	AHVzZXIAc2VjcmV0
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH CRAM-MD5
+	*
+	AUTH PLAIN
+	AHVzZXIAc2VjcmV0
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test880+9 -9

@@ -55,15 +55,15 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH NTLM
-	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	*
-	AUTH PLAIN
-	AHVzZXIAc2VjcmV0
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH NTLM
+	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	*
+	AUTH PLAIN
+	AHVzZXIAc2VjcmV0
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test881+8 -8

@@ -56,14 +56,14 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH DIGEST-MD5
-	*
-	AUTH PLAIN
-	AHVzZXIAc2VjcmV0
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH DIGEST-MD5
+	*
+	AUTH PLAIN
+	AHVzZXIAc2VjcmV0
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test882+11 -11

@@ -42,17 +42,17 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER001 -u user.one:secret -: pop3://%HOSTIP:%PO
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user.one
-	PASS secret
-	RETR %TESTNUMBER001
-	QUIT
-	CAPA
-	USER user.two
-	PASS secret
-	RETR %TESTNUMBER002
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user.one
+	PASS secret
+	RETR %TESTNUMBER001
+	QUIT
+	CAPA
+	USER user.two
+	PASS secret
+	RETR %TESTNUMBER002
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test883+6 -6

@@ -46,12 +46,12 @@ POP3 external authentication
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH EXTERNAL
-	dXNlcg==
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH EXTERNAL
+	dXNlcg==
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test884+6 -6

@@ -46,12 +46,12 @@ POP3 external authentication without credentials
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH EXTERNAL
-	=
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH EXTERNAL
+	=
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test885+5 -5

@@ -46,11 +46,11 @@ POP3 external authentication with initial response
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH EXTERNAL dXNlcg==
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH EXTERNAL dXNlcg==
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test886+5 -5

@@ -46,11 +46,11 @@ POP3 external authentication with initial response without credentials
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH EXTERNAL =
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH EXTERNAL =
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test887+6 -6

@@ -47,12 +47,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH OAUTHBEARER
-	%b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH OAUTHBEARER
+	%b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test888+5 -5

@@ -47,11 +47,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test889+5 -5

@@ -46,11 +46,11 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	CAPA
-	AUTH OAUTHBEARER
-	%b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	AQ==
+	<protocol crlf="yes">
+	CAPA
+	AUTH OAUTHBEARER
+	%b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	AQ==
	</protocol>
	</verify>
	</testcase>

tests/data/test89+25 -25

@@ -106,31 +106,31 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /you/%TESTNUMBER0010 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /you/%TESTNUMBER0010 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /you/%TESTNUMBER0010 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /you/%TESTNUMBER0010 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test890+4 -4

@@ -46,10 +46,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user --oauth2-bearer mF_9.B5f-4.1JqM --s
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	CAPA
-	AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	AQ==
+	<protocol crlf="yes">
+	CAPA
+	AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	AQ==
	</protocol>
	</verify>
	</testcase>

tests/data/test891+4 -4

@@ -35,10 +35,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH CRAM-MD5
-	dXNlciA1YzhkYjAzZjA0Y2VjMGY0M2JjYjA2MDAyMzkxNDE5MA==
+	<protocol crlf="yes">
+	CAPA
+	AUTH CRAM-MD5
+	dXNlciA1YzhkYjAzZjA0Y2VjMGY0M2JjYjA2MDAyMzkxNDE5MA==
	</protocol>
	# CURLE_LOGIN_DENIED
	<errorcode>

tests/data/test892+6 -6

@@ -46,12 +46,12 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --sasl-authzid shared-mailbo
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	AUTH PLAIN
-	c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	AUTH PLAIN
+	c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test893+4 -4

@@ -44,10 +44,10 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u kurt:xipj3plmq --sasl-authzid ursel
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	CAPA
-	AUTH PLAIN
-	dXJzZWwAa3VydAB4aXBqM3BsbXE=
+	<protocol crlf="yes">
+	CAPA
+	AUTH PLAIN
+	dXJzZWwAa3VydAB4aXBqM3BsbXE=
	</protocol>
	</verify>
	</testcase>

tests/data/test895+6 -6

@@ -39,12 +39,12 @@ IMAP with --login-options 'AUTH=*'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN "\"user" "sec\"ret{"
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN "\"user" "sec\"ret{"
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test897+6 -6

@@ -38,12 +38,12 @@ IMAP and envelope meta data after body transfer
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN user secret
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 123 BODY[1]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN user secret
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 123 BODY[1]
+	A005 LOGOUT
	</protocol>
	<file name="%LOGDIR/head-%TESTNUMBER">
	_ _ ____ _

tests/data/test898+15 -15

@@ -74,21 +74,21 @@ HTTP with custom auth and cookies redirected to HTTP on a diff port
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://firsthost.com/ HTTP/1.1
-	Host: firsthost.com
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	Authorization: Basic %b64[joe:secret]b64%
-	Cookie: userpwd=am9lOnNlY3JldA==
-
-	GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
-	Host: firsthost.com:9999
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://firsthost.com/ HTTP/1.1
+	Host: firsthost.com
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	Authorization: Basic %b64[joe:secret]b64%
+	Cookie: userpwd=am9lOnNlY3JldA==
+
+	GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
+	Host: firsthost.com:9999
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test90+35 -35

@@ -144,41 +144,41 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -L

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /you/%TESTNUMBER0010 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /you/%TESTNUMBER0010 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /you/%TESTNUMBER0010 HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /you/%TESTNUMBER0010 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /you/%TESTNUMBER0010 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /you/%TESTNUMBER0010 HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test900+6 -6

@@ -35,12 +35,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
	<upload>
	From: different

tests/data/test901+18 -18

@@ -39,25 +39,25 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-
-	..
-	..
-
-	..
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+
+	..
+	..
+
+	..
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test902+13 -13

@@ -38,20 +38,20 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	HELO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	HELO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test903+11 -11

@@ -39,18 +39,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH PLAIN
-	AHVzZXIAc2VjcmV0
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH PLAIN
+	AHVzZXIAc2VjcmV0
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test904+12 -12

@@ -39,19 +39,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH LOGIN
-	dXNlcg==
-	c2VjcmV0
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH LOGIN
+	dXNlcg==
+	c2VjcmV0
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test905+11 -11

@@ -43,18 +43,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH CRAM-MD5
-	dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH CRAM-MD5
+	dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg==
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test906+12 -12

@@ -45,19 +45,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH NTLM
-	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH NTLM
+	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test907+12 -12

@@ -49,19 +49,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH DIGEST-MD5
-	dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJzbXRwLzEyNy4wLjAuMSIscmVzcG9uc2U9YTI3YzQzOTVmMzM4Njc0M2JlMTIyMDdiN2QxMTIxYzUscW9wPWF1dGg=
-
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH DIGEST-MD5
+	dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJzbXRwLzEyNy4wLjAuMSIscmVzcG9uc2U9YTI3YzQzOTVmMzM4Njc0M2JlMTIyMDdiN2QxMTIxYzUscW9wPWF1dGg=
+
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test908+11 -11

@@ -39,18 +39,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH XOAUTH2
-	dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH XOAUTH2
+	dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test909+12 -12

@@ -33,19 +33,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test91+18 -18

@@ -90,24 +90,24 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u mydomain\\myself:secret

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAALAAsAfgAAAAAAAAAAAAAAhoIBAMIyJpR5mHpg2FZha5kRaFZ9436GAxPu0C5llxexSQ5QzVkiLSfkcpVyRgCXXqR+Am15ZG9tYWlubXlzZWxmV09SS1NUQVRJT04=
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAgACABwAAAABgAGAHgAAAALAAsAfgAAAAAAAAAAAAAAhoIBAMIyJpR5mHpg2FZha5kRaFZ9436GAxPu0C5llxexSQ5QzVkiLSfkcpVyRgCXXqR+Am15ZG9tYWlubXlzZWxmV09SS1NUQVRJT04=
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test910+12 -12

@@ -33,19 +33,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test911+8 -8

@@ -32,15 +32,15 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	.
+	<upload crlf="yes">
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test912+12 -12

@@ -37,19 +37,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]> SIZE=38
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]> SIZE=38
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test913+4 -4

@@ -41,10 +41,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]> SIZE=38
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]> SIZE=38
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test914+4 -4

@@ -40,10 +40,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<invalid>
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<invalid>
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test915+12 -12

@@ -33,19 +33,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] -T -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test916+5 -5

@@ -37,11 +37,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from sender@exam
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<invalid>
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<invalid>
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test917+16 -16

@@ -33,23 +33,23 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mai
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test918+6 -6

@@ -37,12 +37,12 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mai
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	RCPT TO:<invalid>
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	RCPT TO:<invalid>
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test919+10 -10

@@ -39,17 +39,17 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH PLAIN AHVzZXIAc2VjcmV0
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH PLAIN AHVzZXIAc2VjcmV0
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test92+29 -29

@@ -10,32 +10,32 @@ Resume

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 416 Requested Range Not Satisfiable
-	Date: Fri, 24 Oct 2003 21:33:12 GMT
-	Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1
-	Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT
-	ETag: "ab57a-507-3f9968f3"
-	Accept-Ranges: bytes
-	Content-Length: 4
-	Content-Range: bytes */87
-	Content-Type: image/gif
-
+	<data crlf="yes">
+	HTTP/1.1 416 Requested Range Not Satisfiable
+	Date: Fri, 24 Oct 2003 21:33:12 GMT
+	Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1
+	Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT
+	ETag: "ab57a-507-3f9968f3"
+	Accept-Ranges: bytes
+	Content-Length: 4
+	Content-Range: bytes */87
+	Content-Type: image/gif
+
	bad
	</data>

	# The body should be ignored.
-	<datacheck>
-	HTTP/1.1 416 Requested Range Not Satisfiable
-	Date: Fri, 24 Oct 2003 21:33:12 GMT
-	Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1
-	Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT
-	ETag: "ab57a-507-3f9968f3"
-	Accept-Ranges: bytes
-	Content-Length: 4
-	Content-Range: bytes */87
-	Content-Type: image/gif
-
+	<datacheck crlf="yes">
+	HTTP/1.1 416 Requested Range Not Satisfiable
+	Date: Fri, 24 Oct 2003 21:33:12 GMT
+	Server: Apache/1.3.19 (Unix) (Red-Hat/Linux) mod_ssl/2.8.1 OpenSSL/0.9.6 PHP/4.3.1
+	Last-Modified: Fri, 24 Oct 2003 18:01:23 GMT
+	ETag: "ab57a-507-3f9968f3"
+	Accept-Ranges: bytes
+	Content-Length: 4
+	Content-Range: bytes */87
+	Content-Type: image/gif
+
	</datacheck>
	</reply>

@@ -54,13 +54,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87

	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /want/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=87-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /want/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=87-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>

	</verify>

tests/data/test920+11 -11

@@ -39,18 +39,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH LOGIN dXNlcg==
-	c2VjcmV0
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH LOGIN dXNlcg==
+	c2VjcmV0
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test921+11 -11

@@ -45,18 +45,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test922+10 -10

@@ -39,17 +39,17 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH XOAUTH2 dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test923+4 -4

@@ -28,10 +28,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY recipient
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY recipient
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test924+4 -4

@@ -34,10 +34,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt smith
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY smith
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY smith
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test925+4 -4

@@ -31,10 +31,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected]
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY [email protected]
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY [email protected]
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test926+4 -4

@@ -35,10 +35,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY recipient
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY recipient
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test927+4 -4

@@ -34,10 +34,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	EXPN Friends
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	EXPN Friends
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test928+4 -4

@@ -32,10 +32,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	HELP
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	HELP
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test929+4 -4

@@ -29,10 +29,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X NOOP -I
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	NOOP
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	NOOP
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test93+7 -7

@@ -39,13 +39,13 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test930+4 -4

@@ -29,10 +29,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER -X RSET -I
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	RSET
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	RSET
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test932+4 -4

@@ -48,10 +48,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH CRAM-MD5
-	*
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH CRAM-MD5
+	*
	</protocol>
	</verify>
	</testcase>

tests/data/test933+5 -5

@@ -49,11 +49,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH NTLM
-	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	*
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH NTLM
+	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	*
	</protocol>
	</verify>
	</testcase>

tests/data/test934+4 -4

@@ -50,10 +50,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH DIGEST-MD5
-	*
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH DIGEST-MD5
+	*
	</protocol>
	</verify>
	</testcase>

tests/data/test935+13 -13

@@ -47,20 +47,20 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH CRAM-MD5
-	*
-	AUTH PLAIN
-	AHVzZXIAc2VjcmV0
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH CRAM-MD5
+	*
+	AUTH PLAIN
+	AHVzZXIAc2VjcmV0
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test936+14 -14

@@ -48,21 +48,21 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH NTLM
-	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
-	*
-	AUTH PLAIN
-	AHVzZXIAc2VjcmV0
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH NTLM
+	TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
+	*
+	AUTH PLAIN
+	AHVzZXIAc2VjcmV0
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test937+13 -13

@@ -49,20 +49,20 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH DIGEST-MD5
-	*
-	AUTH PLAIN
-	AHVzZXIAc2VjcmV0
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH DIGEST-MD5
+	*
+	AUTH PLAIN
+	AHVzZXIAc2VjcmV0
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test938+18 -18

@@ -41,25 +41,25 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER001 --mail-rcpt [email protected] --mail
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER001
-	AUTH PLAIN
-	dXNlci5vbmUAdXNlci5vbmUAc2VjcmV0
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
-	EHLO %TESTNUMBER002
-	AUTH PLAIN
-	dXNlci50d28AdXNlci50d28Ac2VjcmV0
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER001
+	AUTH PLAIN
+	dXNlci5vbmUAdXNlci5vbmUAc2VjcmV0
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
+	EHLO %TESTNUMBER002
+	AUTH PLAIN
+	dXNlci50d28AdXNlci50d28Ac2VjcmV0
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test939+10 -10

@@ -34,17 +34,17 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	HELO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	HELO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test94+6 -6

@@ -45,12 +45,12 @@ https://test.anything.really.com:%TESTNUMBER --proxy1.0 %HOSTIP:%HTTPPORT
	<errorcode>
	56
	</errorcode>
-	<protocol>
-	CONNECT test.anything.really.com:%TESTNUMBER HTTP/1.0
-	Host: test.anything.really.com:%TESTNUMBER
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	CONNECT test.anything.really.com:%TESTNUMBER HTTP/1.0
+	Host: test.anything.really.com:%TESTNUMBER
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test940+9 -9

@@ -30,16 +30,16 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test941+20 -20

@@ -42,27 +42,27 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	email
-	headers and body
-	with Unix newlines
-	meant to be
-	converted
-	with
-	the
-	--crlf option
-	%repeat[650 x 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
	%0a]%
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	email
+	headers and body
+	with Unix newlines
+	meant to be
+	converted
+	with
+	the
+	--crlf option
+	%repeat[650 x 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789%0d%0a]%
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test942+11 -11

@@ -39,18 +39,18 @@ mail body
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH EXTERNAL
-	dXNlcg==
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH EXTERNAL
+	dXNlcg==
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test943+11 -11

@@ -39,18 +39,18 @@ mail body
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH EXTERNAL
-	=
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH EXTERNAL
+	=
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test944+10 -10

@@ -39,17 +39,17 @@ mail body
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH EXTERNAL dXNlcg==
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH EXTERNAL dXNlcg==
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test945+10 -10

@@ -39,17 +39,17 @@ mail body
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH EXTERNAL =
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH EXTERNAL =
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test946+11 -11

@@ -40,18 +40,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH OAUTHBEARER
-	%b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH OAUTHBEARER
+	%b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test947+10 -10

@@ -40,17 +40,17 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test948+5 -5

@@ -48,11 +48,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH OAUTHBEARER
-	%b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	AQ==
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH OAUTHBEARER
+	%b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	AQ==
	</protocol>
	</verify>
	</testcase>

tests/data/test949+4 -4

@@ -48,10 +48,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
-	AQ==
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH OAUTHBEARER %b64[n,a=user,%01host=127.0.0.1%01port=%SMTPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64%
+	AQ==
	</protocol>
	</verify>
	</testcase>

tests/data/test950+4 -4

@@ -34,10 +34,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient --request "vrfy"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	vrfy recipient
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	vrfy recipient
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test951+9 -9

@@ -30,16 +30,16 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	..This first line starts with a dot
-	.
+	<upload crlf="yes">
+	..This first line starts with a dot
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test952+9 -9

@@ -30,16 +30,16 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	..
-	.
+	<upload crlf="yes">
+	..
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test953+11 -11

@@ -39,18 +39,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH PLAIN
-	dXJzZWwAa3VydAB4aXBqM3BsbXE=
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH PLAIN
+	dXJzZWwAa3VydAB4aXBqM3BsbXE=
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test954+4 -4

@@ -46,10 +46,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# The multi interface considers a broken "CONNECT" as a prematurely broken
	# transfer and such a connection will not get a "QUIT"
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH PLAIN
-	dXJzZWwAa3VydAB4aXBqM3BsbXE=
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH PLAIN
+	dXJzZWwAa3VydAB4aXBqM3BsbXE=
	</protocol>
	</verify>
	</testcase>

tests/data/test955+4 -4

@@ -47,10 +47,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<Avs%hex[%c3%a4]hex%[email protected]>
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<Avs%hex[%c3%a4]hex%[email protected]>
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test956+5 -5

@@ -44,11 +44,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@e
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<St%hex[%c3%b6]hex%[email protected]>
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<St%hex[%c3%b6]hex%[email protected]>
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test957+4 -4

@@ -39,10 +39,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY Anv%hex[%c3%a4]hex%ndaren
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY Anv%hex[%c3%a4]hex%ndaren
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test958+4 -4

@@ -39,10 +39,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren@examp
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY Anv%hex[%c3%a4]hex%[email protected]
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY Anv%hex[%c3%a4]hex%[email protected]
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test959+4 -4

@@ -48,10 +48,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<sender@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<sender@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test960+5 -5

@@ -45,11 +45,11 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3%
	<errorcode>
	55
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<recipient@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<recipient@%hex[%c3%a5%c3%a4%c3%b6]hex%.se>
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test961+4 -4

@@ -40,10 +40,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@%hex[%c3%a5%c3%a4%c3%b6]he
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY user@%hex[%c3%a5%c3%a4%c3%b6]hex%.se
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY user@%hex[%c3%a5%c3%a4%c3%b6]hex%.se
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test962+12 -12

@@ -42,19 +42,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test963+12 -12

@@ -42,19 +42,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3%
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test964+4 -4

@@ -37,10 +37,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt user@%hex[%c3%a5%c3%a4%c3%b6]he
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY [email protected]
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY [email protected]
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test965+12 -12

@@ -45,19 +45,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<Avs%hex[%c3%a4]hex%[email protected]> SMTPUTF8
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<Avs%hex[%c3%a4]hex%[email protected]> SMTPUTF8
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test966+12 -12

@@ -45,19 +45,19 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@%
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]> SMTPUTF8
-	RCPT TO:<St%hex[%c3%b6]hex%[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]> SMTPUTF8
+	RCPT TO:<St%hex[%c3%b6]hex%[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test967+4 -4

@@ -43,10 +43,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren@%hex[
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY Anv%hex[%c3%a4]hex%[email protected] SMTPUTF8
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY Anv%hex[%c3%a4]hex%[email protected] SMTPUTF8
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test968+4 -4

@@ -40,10 +40,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Anv%hex[%c3%a4]hex%ndaren
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	VRFY Anv%hex[%c3%a4]hex%ndaren SMTPUTF8
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	VRFY Anv%hex[%c3%a4]hex%ndaren SMTPUTF8
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test969+8 -8

@@ -14,10 +14,10 @@ IDN
	<servercmd>
	CAPA SMTPUTF8
	</servercmd>
-	<data>
-	250-Joe Smith <[email protected]>
-	250-Harry Smith <[email protected]>
-	250 Melvin Smith <[email protected]>
+	<data crlf="yes">
+	250-Joe Smith <[email protected]>
+	250-Harry Smith <[email protected]>
+	250 Melvin Smith <[email protected]>
	</data>
	</reply>

@@ -42,10 +42,10 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt Friends -X EXPN
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	EXPN Friends SMTPUTF8
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	EXPN Friends SMTPUTF8
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test973+17 -17

@@ -66,23 +66,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u joe:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[joe:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	USER anonymous
-	PASS [email protected]
-	PWD
-	CWD a
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER0002
-	RETR %TESTNUMBER0002
-	QUIT
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[joe:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	USER anonymous
+	PASS [email protected]
+	PWD
+	CWD a
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER0002
+	RETR %TESTNUMBER0002
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test974+14 -14

@@ -72,20 +72,20 @@ HTTP with auth redirected to HTTP on a diff port w/o auth
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://firsthost.com/ HTTP/1.1
-	Host: firsthost.com
-	Authorization: Basic %b64[joe:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
-	Host: firsthost.com:9999
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://firsthost.com/ HTTP/1.1
+	Host: firsthost.com
+	Authorization: Basic %b64[joe:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
+	Host: firsthost.com:9999
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test975+17 -17

@@ -66,23 +66,23 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --location-trusted -u joe:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Authorization: Basic %b64[joe:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-
-	USER joe
-	PASS secret
-	PWD
-	CWD a
-	CWD path
-	EPSV
-	TYPE I
-	SIZE %TESTNUMBER0002
-	RETR %TESTNUMBER0002
-	QUIT
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Authorization: Basic %b64[joe:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	USER joe
+	PASS secret
+	PWD
+	CWD a
+	CWD path
+	EPSV
+	TYPE I
+	SIZE %TESTNUMBER0002
+	RETR %TESTNUMBER0002
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test976+15 -15

@@ -72,21 +72,21 @@ HTTP with auth redirected to HTTP on a diff port --location-trusted
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://firsthost.com/ HTTP/1.1
-	Host: firsthost.com
-	Authorization: Basic %b64[joe:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
-	Host: firsthost.com:9999
-	Authorization: Basic %b64[joe:secret]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://firsthost.com/ HTTP/1.1
+	Host: firsthost.com
+	Authorization: Basic %b64[joe:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1
+	Host: firsthost.com:9999
+	Authorization: Basic %b64[joe:secret]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test980+3 -3

@@ -44,9 +44,9 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	EHLO %TESTNUMBER
-	STARTTLS
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	STARTTLS
	</protocol>
	</verify>
	</testcase>

tests/data/test981+3 -3

@@ -51,9 +51,9 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	A001 CAPABILITY
-	A002 STARTTLS
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 STARTTLS
	</protocol>
	</verify>
	</testcase>

tests/data/test982+3 -3

@@ -49,9 +49,9 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -u user:secret --ssl
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	CAPA
-	STLS
+	<protocol crlf="yes">
+	CAPA
+	STLS
	</protocol>
	</verify>
	</testcase>

tests/data/test983+2 -2

@@ -45,8 +45,8 @@ works
	<errorcode>
	8
	</errorcode>
-	<protocol>
-	AUTH SSL
+	<protocol crlf="yes">
+	AUTH SSL
	</protocol>
	</verify>
	</testcase>

tests/data/test984+2 -2

@@ -49,8 +49,8 @@ Hello Joe, do you think we can meet at 3:30 tomorrow?
	<errorcode>
	64
	</errorcode>
-	<protocol>
-	A001 CAPABILITY
+	<protocol crlf="yes">
+	A001 CAPABILITY
	</protocol>
	</verify>
	</testcase>

tests/data/test987+12 -12

@@ -34,19 +34,19 @@ body
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	From: different
-	To: another
-
-	body
-	.
+	<upload crlf="yes">
+	From: different
+	To: another
+
+	body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test988+14 -14

@@ -9,14 +9,14 @@ FETCH
	#
	# Server-side
	<reply>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

@@ -37,12 +37,12 @@ IMAPS FETCH with redundant explicit SSL request
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	A001 CAPABILITY
-	A002 LOGIN "\"user" "sec\"ret{"
-	A003 SELECT %TESTNUMBER
-	A004 FETCH 1 BODY[]
-	A005 LOGOUT
+	<protocol crlf="yes">
+	A001 CAPABILITY
+	A002 LOGIN "\"user" "sec\"ret{"
+	A003 SELECT %TESTNUMBER
+	A004 FETCH 1 BODY[]
+	A005 LOGOUT
	</protocol>
	</verify>
	</testcase>

tests/data/test989+6 -6

@@ -37,12 +37,12 @@ POP3S RETR with redundant explicit SSL request
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	RETR %TESTNUMBER
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	RETR %TESTNUMBER
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test99+7 -7

@@ -55,13 +55,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 9999999999
	<errorcode>
	33
	</errorcode>
-	<protocol>
-	GET /%TESTNUMBER HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	Range: bytes=9999999999-
-	User-Agent: curl/%VERSION
-	Accept: /
-
+	<protocol crlf="yes">
+	GET /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	Range: bytes=9999999999-
+	User-Agent: curl/%VERSION
+	Accept: /
+
	</protocol>
	</verify>
	</testcase>

tests/data/test992+11 -11

@@ -37,18 +37,18 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-fr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	EHLO %TESTNUMBER
-	AUTH XOAUTH2
-	dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
-	MAIL FROM:<[email protected]>
-	RCPT TO:<[email protected]>
-	DATA
-	QUIT
+	<protocol crlf="yes">
+	EHLO %TESTNUMBER
+	AUTH XOAUTH2
+	dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB
+	MAIL FROM:<[email protected]>
+	RCPT TO:<[email protected]>
+	DATA
+	QUIT
	</protocol>
-	<upload>
-	mail body
-	.
+	<upload crlf="yes">
+	mail body
+	.
	</upload>
	</verify>
	</testcase>

tests/data/test993+6 -6

@@ -31,12 +31,12 @@ pop3://%HOSTIP:%POP3PORT/ -u user:secret
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	LIST
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	LIST
+	QUIT
	</protocol>
	<limits>
	Allocations: 2200

tests/data/test997+11 -11

@@ -12,11 +12,11 @@ RFC2449
	#
	# Server-side
	<reply>
-	<servercmd>
-	CAPA TOP USER
-	</servercmd>
-	<data>
-	</data>
+	<servercmd>
+	CAPA TOP USER
+	</servercmd>
+	<data>
+	</data>
	</reply>

	#
@@ -36,12 +36,12 @@ pop3://%HOSTIP:%POP3PORT -u user:secret -X 'STAT'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	CAPA
-	USER user
-	PASS secret
-	STAT
-	QUIT
+	<protocol crlf="yes">
+	CAPA
+	USER user
+	PASS secret
+	STAT
+	QUIT
	</protocol>
	</verify>
	</testcase>

tests/data/test998+15 -15

@@ -69,21 +69,21 @@ HTTP with auth in URL redirected to another host
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://somewhere.example/998 HTTP/1.1
-	Host: somewhere.example
-	Authorization: Basic %b64[alberto:einstein]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://somewhere.else.example/a/path/9980002 HTTP/1.1
-	Host: somewhere.else.example
-	Authorization: Basic %b64[alberto:einstein]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://somewhere.example/998 HTTP/1.1
+	Host: somewhere.example
+	Authorization: Basic %b64[alberto:einstein]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://somewhere.else.example/a/path/9980002 HTTP/1.1
+	Host: somewhere.else.example
+	Authorization: Basic %b64[alberto:einstein]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>

tests/data/test999+14 -14

@@ -59,20 +59,20 @@ HTTP with auth in first URL but not second
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol>
-	GET http://somewhere.example/%TESTNUMBER HTTP/1.1
-	Host: somewhere.example
-	Authorization: Basic %b64[alberto:einstein]b64%
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
-	GET http://somewhere.else.example/%TESTNUMBER HTTP/1.1
-	Host: somewhere.else.example
-	User-Agent: curl/%VERSION
-	Accept: /
-	Proxy-Connection: Keep-Alive
-
+	<protocol crlf="yes">
+	GET http://somewhere.example/%TESTNUMBER HTTP/1.1
+	Host: somewhere.example
+	Authorization: Basic %b64[alberto:einstein]b64%
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
+	GET http://somewhere.else.example/%TESTNUMBER HTTP/1.1
+	Host: somewhere.else.example
+	User-Agent: curl/%VERSION
+	Accept: /
+	Proxy-Connection: Keep-Alive
+
	</protocol>
	</verify>
	</testcase>