← Commit list

63e9721b63

Viktor Szakats

2025-11-03

SUCCESS Duration: 152s

Subject

tests: avoid hard-coded CRLFs in more sections

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 →

docs/tests/FILEFORMAT.md+45 -14

@@ -241,7 +241,7 @@ similar.

	## `<reply>`

-	### `<data [nocheck="yes"] [sendzero="yes"] [hex="yes"] [nonewline="yes"] [crlf="yes"]>`
+	### `<data [nocheck="yes"] [sendzero="yes"] [hex="yes"] [nonewline="yes"] [crlf="yes\|headers"]>`

	data to be sent to the client on its request and later verified that it
	arrived safely. Set `nocheck="yes"` to prevent the test script from verifying
@@ -269,16 +269,19 @@ used as "raw" data.
	`nonewline=yes` means that the last byte (the trailing newline character)
	should be cut off from the data before sending or comparing it.

-	`crlf=yes` forces header newlines to become CRLF even if not written so in
-	the source file. Note that this makes runtests.pl parse and "guess" what is a
-	header and what is not in order to apply the CRLF line endings appropriately.
+	`crlf=yes` forces the newlines to become CRLF even if not written so in the
+	test.
+
+	`crlf=headers` forces header newlines to become CRLF even if not written so
+	in the source file. Note that this makes runtests.pl parse and "guess" what is
+	a header and what is not in order to apply the CRLF line endings appropriately.

	For FTP file listings, the `<data>` section is be used only if you make sure
	that there has been a CWD done first to a directory named `test-[NUM]` where
	`NUM` is the test case number. Otherwise the ftp server cannot know from which
	test file to load the list content.

-	### `<dataNUM [crlf="yes"]>`
+	### `<dataNUM [crlf="yes\|headers"]>`

	Send back this contents instead of the `<data>` one. The `NUM` is set by:

@@ -297,15 +300,22 @@ to complete a transfer. The response to each request is found in its own data
	section. Validating the entire negotiation sequence can be done by specifying
	a `datacheck` section.

-	### `<connect>`
+	### `<connect [crlf="yes\|headers"]>`
	The connect section is used instead of the 'data' for all CONNECT
	requests. The remainder of the rules for the data section then apply but with
	a connect prefix.

+	`crlf=yes` forces the newlines to become CRLF even if not written so in the
+	test.
+
+	`crlf=headers` forces header newlines to become CRLF even if not written so
+	in the source file. Note that this makes runtests.pl parse and "guess" what is
+	a header and what is not in order to apply the CRLF line endings appropriately.
+
	### `<socks>`
	Address type and address details as logged by the SOCKS proxy.

-	### `<datacheck [mode="text"] [nonewline="yes"] [crlf="yes"]>`
+	### `<datacheck [mode="text"] [nonewline="yes"] [crlf="yes\|headers"]>`
	if the data is sent but this is what should be checked afterwards. If
	`nonewline=yes` is set, runtests cuts off the trailing newline from the data
	before comparing with the one actually received by the client.
@@ -313,7 +323,7 @@ before comparing with the one actually received by the client.
	Use the `mode="text"` attribute if the output is in text mode on platforms
	that have a text/binary difference.

-	### `<datacheckNUM [nonewline="yes"] [mode="text"] [crlf="yes"]>`
+	### `<datacheckNUM [nonewline="yes"] [mode="text"] [crlf="yes\|headers"]>`
	The contents of numbered `datacheck` sections are appended to the non-numbered
	one.

@@ -613,13 +623,16 @@ parameter is the not negative integer number of seconds for the delay. This
	'delay' attribute is intended for specific test cases, and normally not
	needed.

-	### `<file name="%LOGDIR/filename" [nonewline="yes"]>`
+	### `<file name="%LOGDIR/filename" [nonewline="yes"][crlf="yes"]>`
	This creates the named file with this content before the test case is run,
	which is useful if the test case needs a file to act on.

	If `nonewline="yes"` is used, the created file gets the final newline stripped
	off.

+	`crlf=yes` forces the newlines to become CRLF even if not written so in the
+	test.
+
	### `<file1>`
	1 to 4 can be appended to 'file' to create more files.

@@ -629,12 +642,15 @@ off.

	### `<file4>`

-	### `<stdin [nonewline="yes"]>`
+	### `<stdin [nonewline="yes"][crlf="yes"]>`
	Pass this given data on stdin to the tool.

	If `nonewline` is set, we cut off the trailing newline of this given data
	before comparing with the one actually received by the client

+	`crlf=yes` forces the newlines to become CRLF even if not written so in the
+	test.
+
	## `<disable>`

	If `test-duphandle` is a listed item here, this is not run when
@@ -677,14 +693,14 @@ test.
	in the source file. Note that this makes runtests.pl parse and "guess" what is
	a header and what is not in order to apply the CRLF line endings appropriately.

-	### `<proxy [nonewline="yes"][crlf="yes"]>`
+	### `<proxy [nonewline="yes"][crlf="yes\|headers"]>`

	The protocol dump curl should transmit to an HTTP proxy (when the http-proxy
	server is used), if `nonewline` is set, we cut off the trailing newline of
	this given data before comparing with the one actually sent by the client The
	`<strip>` and `<strippart>` rules are applied before comparisons are made.

-	### `<stderr [mode="text"] [nonewline="yes"] [crlf="yes"]>`
+	### `<stderr [mode="text"] [nonewline="yes"] [crlf="yes\|headers"]>`
	This verifies that this data was passed to stderr.

	Use the mode="text" attribute if the output is in text mode on platforms that
@@ -693,10 +709,14 @@ have a text/binary difference.
	`crlf=yes` forces the newlines to become CRLF even if not written so in the
	test.

+	`crlf=headers` forces header newlines to become CRLF even if not written so
+	in the source file. Note that this makes runtests.pl parse and "guess" what is
+	a header and what is not in order to apply the CRLF line endings appropriately.
+
	If `nonewline` is set, we cut off the trailing newline of this given data
	before comparing with the one actually received by the client

-	### `<stdout [mode="text"] [nonewline="yes"] [crlf="yes"] [loadfile="filename"]>`
+	### `<stdout [mode="text"] [nonewline="yes"] [crlf="yes\|headers"] [loadfile="filename"]>`
	This verifies that this data was passed to stdout.

	Use the mode="text" attribute if the output is in text mode on platforms that
@@ -708,6 +728,10 @@ before comparing with the one actually received by the client
	`crlf=yes` forces the newlines to become CRLF even if not written so in the
	test.

+	`crlf=headers` forces header newlines to become CRLF even if not written so
+	in the source file. Note that this makes runtests.pl parse and "guess" what is
+	a header and what is not in order to apply the CRLF line endings appropriately.
+
	`loadfile="filename"` makes loading the data from an external file.

	### `<limit>`
@@ -718,11 +742,18 @@ that the set limits are not exceeded. Supported limits:
	Allocations: [number of allocation calls]
	Maximum allocated: [maximum concurrent memory allocated]

-	### `<file name="%LOGDIR/filename" [mode="text"]>`
+	### `<file name="%LOGDIR/filename" [mode="text"] [crlf="yes\|headers"]>`
	The file's contents must be identical to this after the test is complete. Use
	the mode="text" attribute if the output is in text mode on platforms that have
	a text/binary difference.

+	`crlf=yes` forces the newlines to become CRLF even if not written so in the
+	test.
+
+	`crlf=headers` forces header newlines to become CRLF even if not written so
+	in the source file. Note that this makes runtests.pl parse and "guess" what is
+	a header and what is not in order to apply the CRLF line endings appropriately.
+
	### `<file1>`
	1 to 4 can be appended to 'file' to compare more files.

tests/data/test1+2 -2

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1001+35 -35

@@ -13,45 +13,45 @@ CUSTOMREQUEST

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test1002+35 -35

@@ -12,45 +12,45 @@ CUSTOMREQUEST
	</info>

	<reply>
-	<data>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test1004+1 -1

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

tests/data/test1008+16 -16

@@ -18,26 +18,26 @@ connection-monitor
	</servercmd>

	# this is returned first since we get no proxy-auth
-	<connect1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Transfer-Encoding: chunked
-
-	20
-	And you should ignore this data.
-	FA0
-	%repeat[4000 x X]%
-	0
-
+	<connect1001 crlf="yes">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Transfer-Encoding: chunked
+
+	20
+	And you should ignore this data.
+	FA0
+	%repeat[4000 x X]%
+	0
+
	</connect1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<connect1002>
-	HTTP/1.1 200 Things are fine in proxy land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-
+	<connect1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+
	</connect1002>

	# this is returned when we get a GET!

tests/data/test1011+23 -23

@@ -9,32 +9,32 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 OK
-	Location: moo.html&testcase=/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 301 OK
+	Location: moo.html&testcase=/%TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 0
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 301 OK
-	Location: moo.html&testcase=/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 0
-
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 301 OK
+	Location: moo.html&testcase=/%TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 0
+
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</datacheck>
	</reply>

tests/data/test1012+23 -23

@@ -9,32 +9,32 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 OK swsclose
-	Location: moo.html&testcase=/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 301 OK swsclose
+	Location: moo.html&testcase=/%TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 301 OK swsclose
-	Location: moo.html&testcase=/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 301 OK swsclose
+	Location: moo.html&testcase=/%TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</datacheck>
	</reply>

tests/data/test1015+5 -5

@@ -10,11 +10,11 @@ HTTP POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 I am cool swsclose
-	Server: Cool server/10.0
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 200 I am cool swsclose
+	Server: Cool server/10.0
+	Content-Length: 0
+
	</data>
	</reply>

tests/data/test1021+17 -17

@@ -13,31 +13,31 @@ NTLM
	# Server-side
	<reply>

-	<connect>
-	HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
-	Proxy-Authenticate: NTLM
-	Content-Length: 16
-	Connection: close
-
+	<connect crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
+	Proxy-Authenticate: NTLM
+	Content-Length: 16
+	Connection: close
+
	data to discard
	</connect>

	# this is returned first since we get no proxy-auth
-	<connect1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 28
-
+	<connect1001 crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 28
+
	27 bytes and newline to ign
	</connect1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<connect1002>
-	HTTP/1.1 200 Things are fine in proxy land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-
+	<connect1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+
	</connect1002>

	# this is returned when we get a GET!
@@ -106,7 +106,7 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1024+43 -43

@@ -10,57 +10,57 @@ cookies

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 This is a weirdo text message
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: ../data/%TESTNUMBER0002.txt
-	Set-Cookie: firstcookie=want; path=/want/
-	Content-Length: 69
-
+	<data crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: ../data/%TESTNUMBER0002.txt
+	Set-Cookie: firstcookie=want; path=/want/
+	Content-Length: 69
+
	This server reply is for testing a Location: following with cookies

	</data>
-	<data2>
-	HTTP/1.1 301 This is a weirdo text message
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: ../want/%TESTNUMBER0003.txt
-	Set-Cookie: nextcookie=data; path=/data/
-	Content-Length: 69
-
+	<data2 crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: ../want/%TESTNUMBER0003.txt
+	Set-Cookie: nextcookie=data; path=/data/
+	Content-Length: 69
+
	This server reply is for testing a Location: following with cookies

	</data2>
-	<data3>
-	HTTP/1.1 200 Followed here fine
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 52
-
+	<data3 crlf="headers">
+	HTTP/1.1 200 Followed here fine
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 52
+
	If this is received, the location following worked

	</data3>
-	<datacheck>
-	HTTP/1.1 301 This is a weirdo text message
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: ../data/%TESTNUMBER0002.txt
-	Set-Cookie: firstcookie=want; path=/want/
-	Content-Length: 69
-
-	HTTP/1.1 301 This is a weirdo text message
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: ../want/%TESTNUMBER0003.txt
-	Set-Cookie: nextcookie=data; path=/data/
-	Content-Length: 69
-
-	HTTP/1.1 200 Followed here fine
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 52
-
+	<datacheck crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: ../data/%TESTNUMBER0002.txt
+	Set-Cookie: firstcookie=want; path=/want/
+	Content-Length: 69
+
+	HTTP/1.1 301 This is a weirdo text message
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: ../want/%TESTNUMBER0003.txt
+	Set-Cookie: nextcookie=data; path=/data/
+	Content-Length: 69
+
+	HTTP/1.1 200 Followed here fine
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 52
+
	If this is received, the location following worked

	</datacheck>
@@ -84,7 +84,7 @@ cookies

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

tests/data/test1025+43 -43

@@ -10,57 +10,57 @@ cookies

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 This is a weirdo text message
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: ../data/%TESTNUMBER0002.txt
-	Set-Cookie: firstcookie=want; path=/want/
-	Content-Length: 69
-
+	<data crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: ../data/%TESTNUMBER0002.txt
+	Set-Cookie: firstcookie=want; path=/want/
+	Content-Length: 69
+
	This server reply is for testing a Location: following with cookies

	</data>
-	<data2>
-	HTTP/1.1 301 This is a weirdo text message
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: ../want/%TESTNUMBER0003.txt
-	Set-Cookie: nextcookie=data; path=/data/
-	Content-Length: 69
-
+	<data2 crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: ../want/%TESTNUMBER0003.txt
+	Set-Cookie: nextcookie=data; path=/data/
+	Content-Length: 69
+
	This server reply is for testing a Location: following with cookies

	</data2>
-	<data3>
-	HTTP/1.1 200 Followed here fine
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 52
-
+	<data3 crlf="headers">
+	HTTP/1.1 200 Followed here fine
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 52
+
	If this is received, the location following worked

	</data3>
-	<datacheck>
-	HTTP/1.1 301 This is a weirdo text message
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: ../data/%TESTNUMBER0002.txt
-	Set-Cookie: firstcookie=want; path=/want/
-	Content-Length: 69
-
-	HTTP/1.1 301 This is a weirdo text message
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: ../want/%TESTNUMBER0003.txt
-	Set-Cookie: nextcookie=data; path=/data/
-	Content-Length: 69
-
-	HTTP/1.1 200 Followed here fine
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 52
-
+	<datacheck crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: ../data/%TESTNUMBER0002.txt
+	Set-Cookie: firstcookie=want; path=/want/
+	Content-Length: 69
+
+	HTTP/1.1 301 This is a weirdo text message
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: ../want/%TESTNUMBER0003.txt
+	Set-Cookie: nextcookie=data; path=/data/
+	Content-Length: 69
+
+	HTTP/1.1 200 Followed here fine
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 52
+
	If this is received, the location following worked

	</datacheck>
@@ -84,7 +84,7 @@ cookies

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

tests/data/test1028+20 -20

@@ -13,16 +13,16 @@ FILE
	#
	# Server-side
	<reply>
-	<data1>
-	HTTP/1.1 302 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/html
-	Funny-head: yesyes
-	Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002
-	Content-Length: 0
-	Connection: close
-
+	<data1 crlf="headers">
+	HTTP/1.1 302 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/html
+	Funny-head: yesyes
+	Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002
+	Content-Length: 0
+	Connection: close
+
	</data1>
	<data2>
	data
@@ -67,16 +67,16 @@ SIZE %TESTNUMBER0002
	RETR %TESTNUMBER0002
	QUIT
	</protocol>
-	<stdout>
-	HTTP/1.1 302 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/html
-	Funny-head: yesyes
-	Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002
-	Content-Length: 0
-	Connection: close
-
+	<stdout crlf="headers">
+	HTTP/1.1 302 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/html
+	Funny-head: yesyes
+	Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002
+	Content-Length: 0
+	Connection: close
+
	data
	to
	see

tests/data/test1029+13 -13

@@ -11,12 +11,12 @@ followlocation

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	</data>
	</reply>
@@ -36,19 +36,19 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url} %{url} %{ex

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	<stdout crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER 0%spc%
	</stdout>

tests/data/test1030+31 -31

@@ -10,45 +10,45 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Length: 26
-	Content-Type: text/html; charset=iso-8859-1
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Length: 26
+	Content-Type: text/html; charset=iso-8859-1
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-	Connection: close
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Length: 26
-	Content-Type: text/html; charset=iso-8859-1
-
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Length: 26
+	Content-Type: text/html; charset=iso-8859-1
+
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</datacheck>

tests/data/test1031+1 -1

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

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

tests/data/test1032+1 -1

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

tests/data/test1033+1 -1

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

tests/data/test1040+6 -6

@@ -10,11 +10,11 @@ Resume

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 416 Invalid range
-	Connection: close
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 416 Invalid range
+	Connection: close
+	Content-Length: 0
+
	</data>

	# The file data that exists at the start of the test must be included in
@@ -65,7 +65,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -

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

tests/data/test1041+9 -9

@@ -11,15 +11,15 @@ Content-Range

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Accept-Ranges: bytes
-	Content-Length: 0
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Accept-Ranges: bytes
+	Content-Length: 0
+	Connection: close
+	Content-Type: text/html
+
	</data>
	</reply>

tests/data/test1042+7 -7

@@ -11,12 +11,12 @@ FAILURE
	# Server-side
	<reply>
	# Some servers (e.g. Apache 1.2) respond this way to an invalid byte range
-	<data>
-	HTTP/1.1 200 OK
-	Connection: close
-	Content-Length: 100
-	Content-Type: text/plain
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Connection: close
+	Content-Length: 100
+	Content-Type: text/plain
+
	012345678
	012345678
	012345678
@@ -80,7 +80,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200
	<errorcode>
	33
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=200-

tests/data/test1043+9 -9

@@ -9,14 +9,14 @@ Resume

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 206 Partial Content
-	Date: Mon, 13 Nov 2007 13:41:09 GMT
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	Accept-Ranges: bytes
-	Content-Length: 60
-	Content-Range: bytes 40-99/100
-
+	<data crlf="headers">
+	HTTP/1.1 206 Partial Content
+	Date: Mon, 13 Nov 2007 13:41:09 GMT
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	Accept-Ranges: bytes
+	Content-Length: 60
+	Content-Range: bytes 40-99/100
+
	012345678
	012345678
	012345678
@@ -70,7 +70,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -

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

tests/data/test1044+4 -4

@@ -49,10 +49,10 @@ SIZE %TESTNUMBER
	REST 0
	QUIT
	</protocol>
-	<stdout>
-	Last-Modified: Sat, 26 Jul 2008 10:26:59 GMT
-	Content-Length: 9999999999
-	Accept-ranges: bytes
+	<stdout crlf="headers">
+	Last-Modified: Sat, 26 Jul 2008 10:26:59 GMT
+	Content-Length: 9999999999
+	Accept-ranges: bytes
	</stdout>
	</verify>
	</testcase>

tests/data/test1045+9 -9

@@ -10,14 +10,14 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 28 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/plain
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 28 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/plain
+
	-foo-
	</data>
	</reply>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --interface %CLIENTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1046+9 -9

@@ -11,14 +11,14 @@ IPv6
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 28 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/plain
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 28 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/plain
+
	-foo-
	</data>
	</reply>
@@ -43,7 +43,7 @@ HTTP-IPv6 GET with numeric localhost --interface
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOST6IP:%HTTP6PORT
	User-Agent: curl/%VERSION

tests/data/test1051+31 -31

@@ -9,40 +9,40 @@ followlocation
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 Redirect swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 301 Redirect swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 0
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.1 100 Continue
-
-	HTTP/1.1 200 Followed here fine swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 51
-
+	<data2 crlf="headers">
+	HTTP/1.1 100 Continue
+
+	HTTP/1.1 200 Followed here fine swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 51
+
	If this is received, the location following worked
	</data2>
-	<datacheck>
-	HTTP/1.1 301 Redirect swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 0
-	Connection: close
-
-	HTTP/1.1 100 Continue
-
-	HTTP/1.1 200 Followed here fine swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 51
-
+	<datacheck crlf="headers">
+	HTTP/1.1 301 Redirect swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 0
+	Connection: close
+
+	HTTP/1.1 100 Continue
+
+	HTTP/1.1 200 Followed here fine swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 51
+
	If this is received, the location following worked
	</datacheck>
	</reply>

tests/data/test1052+27 -27

@@ -9,36 +9,36 @@ followlocation
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 301 Redirect swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.0 301 Redirect swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 0
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.0 200 Followed here fine swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 51
-
+	<data2 crlf="headers">
+	HTTP/1.0 200 Followed here fine swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 51
+
	If this is received, the location following worked
	</data2>
-	<datacheck>
-	HTTP/1.0 301 Redirect swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 0
-	Connection: close
-
-	HTTP/1.0 200 Followed here fine swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 51
-
+	<datacheck crlf="headers">
+	HTTP/1.0 301 Redirect swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 0
+	Connection: close
+
+	HTTP/1.0 200 Followed here fine swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 51
+
	If this is received, the location following worked
	</datacheck>
	</reply>

tests/data/test1053+29 -29

@@ -11,39 +11,39 @@ followlocation

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 307 Redirect swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 307 Redirect swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 0
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 11
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 11
+	Connection: close
+
	blablabla

	</data2>
-	<datacheck>
-	HTTP/1.1 307 Redirect swsclose
-	Date: Thu, 29 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 0
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 11
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 307 Redirect swsclose
+	Date: Thu, 29 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 0
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 11
+	Connection: close
+
	blablabla

	</datacheck>

tests/data/test1054+21 -21

@@ -10,30 +10,30 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 OK swsclose
-	Location: moo/testcase/%TESTNUMBER0002
-	Date: Thu, 31 Jul 2008 14:49:00 GMT
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 301 OK swsclose
+	Location: moo/testcase/%TESTNUMBER0002
+	Date: Thu, 31 Jul 2008 14:49:00 GMT
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK swsclose
-	Date: Thu, 31 Jul 2008 14:49:00 GMT
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Thu, 31 Jul 2008 14:49:00 GMT
+	Connection: close
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 301 OK swsclose
-	Location: moo/testcase/%TESTNUMBER0002
-	Date: Thu, 31 Jul 2008 14:49:00 GMT
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Date: Thu, 31 Jul 2008 14:49:00 GMT
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 301 OK swsclose
+	Location: moo/testcase/%TESTNUMBER0002
+	Date: Thu, 31 Jul 2008 14:49:00 GMT
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Date: Thu, 31 Jul 2008 14:49:00 GMT
+	Connection: close
+
	body
	</datacheck>
	</reply>

tests/data/test1055+9 -9

@@ -13,15 +13,15 @@ STOR
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 307 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/html
-	Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 307 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/html
+	Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
+	Content-Length: 0
+	Connection: close
+
	</data>
	</reply>

tests/data/test1056+22 -22

@@ -11,30 +11,30 @@ IPv6
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 OK swsclose
-	Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002
-	Date: Thu, 31 Jul 2008 14:49:00 GMT
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 302 OK swsclose
+	Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002
+	Date: Thu, 31 Jul 2008 14:49:00 GMT
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK swsclose
-	Date: Thu, 31 Jul 2008 14:49:00 GMT
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Thu, 31 Jul 2008 14:49:00 GMT
+	Connection: close
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 302 OK swsclose
-	Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002
-	Date: Thu, 31 Jul 2008 14:49:00 GMT
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Date: Thu, 31 Jul 2008 14:49:00 GMT
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 302 OK swsclose
+	Location: http://[::1%259999]:%HTTP6PORT/moo/%TESTNUMBER0002
+	Date: Thu, 31 Jul 2008 14:49:00 GMT
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Date: Thu, 31 Jul 2008 14:49:00 GMT
+	Connection: close
+
	body
	</datacheck>
	</reply>
@@ -66,7 +66,7 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1058+10 -10

@@ -9,15 +9,15 @@ Content-Range

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 206 Partial Content
-	Date: Thu, 31 Jul 2008 13:41:09 GMT
-	Accept-Ranges: bytes
-	Content-Length: 101
-	Content-Range: bytes 100-200/201
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 206 Partial Content
+	Date: Thu, 31 Jul 2008 13:41:09 GMT
+	Accept-Ranges: bytes
+	Content-Length: 101
+	Content-Range: bytes 100-200/201
+	Connection: close
+	Content-Type: text/html
+
	..partial data returned from the
	server as a result of setting an explicit byte range
	in the request
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r -101

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

tests/data/test1059+7 -7

@@ -12,12 +12,12 @@ FAILURE
	#
	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 501 Method not implemented swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-	Content-Length: 0
-
+	<connect crlf="headers">
+	HTTP/1.1 501 Method not implemented swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+	Content-Length: 0
+
	</connect>
	</reply>

@@ -46,7 +46,7 @@ ftp://test-number:%TESTNUMBER/wanted/page -p -x %HOSTIP:%HTTPPORT
	<errorcode>
	56
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test-number:%TESTNUMBER HTTP/1.1
	Host: test-number:%TESTNUMBER
	User-Agent: curl/%VERSION

tests/data/test1060+7 -7

@@ -14,12 +14,12 @@ HTTP proxy Digest auth
	<reply>

	# this is returned first since we get no proxy-auth
-	<connect>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
-	Content-Length: 35701
-	X-tra-long-header: %repeat[16080 x a]%
-
+	<connect crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
+	Content-Length: 35701
+	X-tra-long-header: %repeat[16080 x a]%
+
	%repeat[700 x And you should ignore this data. aaaaaaaaaaaaaaaa %0a]%
	</connect>

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

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
	Host: test.remote.haxx.se.%TESTNUMBER:8990
	User-Agent: curl/%VERSION

tests/data/test1061+1 -1

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

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
	Host: test.remote.haxx.se.%TESTNUMBER:8990
	User-Agent: curl/%VERSION

tests/data/test1064+23 -23

@@ -7,20 +7,20 @@ HTTP PUT
	</info>

	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 A OK
-	Server: curl test
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 A OK
+	Server: curl test
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data>
-	<data2 nocheck="yes">
-	HTTP/1.1 200 A OK
-	Server: curl test
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 9
-
+	<data2 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 A OK
+	Server: curl test
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 9
+
	still ok
	</data2>
	</reply>
@@ -60,18 +60,18 @@ Content-Length: 5

	test
	</protocol>
-	<stdout>
-	HTTP/1.1 200 A OK
-	Server: curl test
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: curl test
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
-	HTTP/1.1 200 A OK
-	Server: curl test
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 9
-
+	HTTP/1.1 200 A OK
+	Server: curl test
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 9
+
	still ok
	</stdout>
	</verify>

tests/data/test1065+23 -23

@@ -8,20 +8,20 @@ HTTP GET
	</info>

	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 A OK
-	Server: curl test
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 A OK
+	Server: curl test
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data>
-	<data2 nocheck="yes">
-	HTTP/1.1 200 A OK
-	Server: curl test
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 9
-
+	<data2 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 A OK
+	Server: curl test
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 9
+
	still ok
	</data2>
	</reply>
@@ -59,18 +59,18 @@ User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<stdout>
-	HTTP/1.1 200 A OK
-	Server: curl test
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: curl test
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
-	HTTP/1.1 200 A OK
-	Server: curl test
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 9
-
+	HTTP/1.1 200 A OK
+	Server: curl test
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 9
+
	still ok
	</stdout>
	</verify>

tests/data/test1066+13 -13

@@ -8,20 +8,20 @@ HTTP GET

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Server: thebest/1.0
-	Content-Type: text/plain
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Server: thebest/1.0
+	Content-Type: text/plain
+	Content-Length: 6
+
	first
	</data>
-	<data1 nocheck="yes">
-	HTTP/1.1 200 OK
-	Server: thebest/1.0
-	Content-Type: text/plain
-	Content-Length: 7
-
+	<data1 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Server: thebest/1.0
+	Content-Type: text/plain
+	Content-Length: 7
+
	second
	</data1>
	</reply>
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUM

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

tests/data/test1067+1 -1

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

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

tests/data/test1068+5 -5

@@ -10,11 +10,11 @@ chunked Transfer-Encoding

	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+
	blablabla

	</data>

tests/data/test1070+7 -7

@@ -8,13 +8,13 @@ HTTP POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 403 Go away and swsclose
-	Server: test-server/fake
-	Content-Type: text/html
-	Content-Length: 55
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 403 Go away and swsclose
+	Server: test-server/fake
+	Content-Type: text/html
+	Content-Length: 55
+	Connection: close
+
	you are not supposed to be allowed to send things here
	</data>
	<servercmd>

tests/data/test1071+33 -33

@@ -14,47 +14,47 @@ HTTP/1.0

	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 401 Authorization Required swsclose
-	Server: testcurl
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Type: text/plain
-	Content-Length: 35
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.0 401 Authorization Required swsclose
+	Server: testcurl
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Type: text/plain
+	Content-Length: 35
+	Connection: close
+
	Try again on this HTTP 1.0 server!
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.0 200 OK swsclose
-	Server: testcurl
-	Content-Type: text/plain
-	Content-Length: 23
-	Connection: close
-
+	<data1000 crlf="headers">
+	HTTP/1.0 200 OK swsclose
+	Server: testcurl
+	Content-Type: text/plain
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.0 401 Authorization Required swsclose
-	Server: testcurl
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Type: text/plain
-	Content-Length: 35
-	Connection: close
-
-	HTTP/1.0 200 OK swsclose
-	Server: testcurl
-	Content-Type: text/plain
-	Content-Length: 23
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.0 401 Authorization Required swsclose
+	Server: testcurl
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Type: text/plain
+	Content-Length: 35
+	Connection: close
+
+	HTTP/1.0 200 OK swsclose
+	Server: testcurl
+	Content-Type: text/plain
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</datacheck>

tests/data/test1072+10 -10

@@ -15,16 +15,16 @@ chunked Transfer-Encoding

	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 401 Authorization Required swsclose
-	Server: testcurl
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Type: text/plain
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.0 401 Authorization Required swsclose
+	Server: testcurl
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Type: text/plain
+	Content-Length: 0
+	Connection: close
+
	</data>
	</reply>

tests/data/test1073+8 -8

@@ -14,14 +14,14 @@ chunked Transfer-Encoding

	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 301 Redirect swsclose
-	Server: testcurl
-	Content-Type: text/plain
-	Location: /newlocation/%TESTNUMBER0002
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.0 301 Redirect swsclose
+	Server: testcurl
+	Content-Type: text/plain
+	Location: /newlocation/%TESTNUMBER0002
+	Content-Length: 0
+	Connection: close
+
	</data>
	</reply>

tests/data/test1074+22 -22

@@ -10,19 +10,19 @@ DELAY

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.0 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 9
-	Connection: Keep-Alive
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.0 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 9
+	Connection: Keep-Alive
+
	surprise
	</data>
-	<data1>
-	HTTP/1.0 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data1 crlf="headers">
+	HTTP/1.0 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	surprise2
	</data1>

@@ -46,21 +46,21 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TES

	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/1.0 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 9
-	Connection: Keep-Alive
-
+	<stdout crlf="headers">
+	HTTP/1.0 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 9
+	Connection: Keep-Alive
+
	surprise
-	HTTP/1.0 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	HTTP/1.0 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	surprise2
	</stdout>

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

tests/data/test1075+26 -26

@@ -13,33 +13,33 @@ HTTP Basic auth
	# The test server provides no way to respond differently to a subsequent
	# Basic authenticated request (we really want to respond with 200 for
	# the second), so just respond with 401 for both and let curl deal with it.
-	<data>
-	HTTP/1.1 401 Authorization Required
-	Server: testcurl
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: X-bogus-auth realm="gimme all yer s3cr3ts"
-	Content-Type: text/plain
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: testcurl
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: X-bogus-auth realm="gimme all yer s3cr3ts"
+	Content-Type: text/plain
+	Content-Length: 0
+
	</data>
-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	Server: testcurl
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: X-bogus-auth realm="gimme all yer s3cr3ts"
-	Content-Type: text/plain
-	Content-Length: 0
-
-	HTTP/1.1 401 Authorization Required
-	Server: testcurl
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: X-bogus-auth realm="gimme all yer s3cr3ts"
-	Content-Type: text/plain
-	Content-Length: 0
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: testcurl
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: X-bogus-auth realm="gimme all yer s3cr3ts"
+	Content-Type: text/plain
+	Content-Length: 0
+
+	HTTP/1.1 401 Authorization Required
+	Server: testcurl
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: X-bogus-auth realm="gimme all yer s3cr3ts"
+	Content-Type: text/plain
+	Content-Length: 0
+
	</datacheck>
	</reply>

tests/data/test1077+19 -19

@@ -12,26 +12,26 @@ HTTP proxy
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/plain
-	Content-Length: 9
-	Funny-head: yesyes
-	Proxy-Connection: Keep-Alive
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/plain
+	Content-Length: 9
+	Funny-head: yesyes
+	Proxy-Connection: Keep-Alive
+
	contents
	</data>
-	<data2>
-	HTTP/1.0 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/plain
-	Content-Length: 9
-	Funny-head: yesyes
-	Proxy-Connection: Keep-Alive
-
+	<data2 crlf="headers">
+	HTTP/1.0 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/plain
+	Content-Length: 9
+	Funny-head: yesyes
+	Proxy-Connection: Keep-Alive
+
	contents
	</data2>
	</reply>
@@ -57,7 +57,7 @@ FTP over HTTP proxy with downgrade to HTTP 1.0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1078+40 -40

@@ -13,21 +13,21 @@ proxytunnel
	#
	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	Server: test tunnel 2000
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Server: test tunnel 2000
+
	</connect>

-	<data nocheck="yes">
-	HTTP/1.0 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 9
-	Connection: keep-alive
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.0 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 9
+	Connection: keep-alive
+
	contents
	</data>
	</reply>
@@ -53,14 +53,14 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT %HOSTIP:%HTTPPORT HTTP/1.0
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT %HOSTIP:%HTTPPORT HTTP/1.0
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -72,27 +72,27 @@ User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<stdout>
-	HTTP/1.1 200 Mighty fine indeed
-	Server: test tunnel 2000
-
-	HTTP/1.0 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 9
-	Connection: keep-alive
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Server: test tunnel 2000
+
+	HTTP/1.0 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 9
+	Connection: keep-alive
+
	contents
-	HTTP/1.0 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 9
-	Connection: keep-alive
-
+	HTTP/1.0 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 9
+	Connection: keep-alive
+
	contents
	</stdout>
	</verify>

tests/data/test1079+15 -15

@@ -9,13 +9,13 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/plain; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/plain; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

@@ -25,13 +25,13 @@ This is not the real page
	<data1000>
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/plain; charset=iso-8859-1
-	Content-Length: 26
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/plain; charset=iso-8859-1
+	Content-Length: 26
+
	</datacheck>

	</reply>
@@ -59,7 +59,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --digest
	<errorcode>
	52
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1080+18 -18

@@ -11,12 +11,12 @@ followlocation

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	</data>
	</reply>
@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/wan

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

	</protocol>
-	<stdout>
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	<stdout crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes
	</stdout>

tests/data/test1081+24 -24

@@ -11,20 +11,20 @@ followlocation

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/%TESTNUMBER0099.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/%TESTNUMBER0099.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	</data>
-	<data2 nocheck="yes">
-	HTTP/1.1 200 Followed here fine swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 41
-
+	<data2 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 Followed here fine swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 41
+
	This second URL does not have a location
	</data2>
	</reply>
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/wan

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

	</protocol>
-	<stdout>
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/%TESTNUMBER0099.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	<stdout crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/%TESTNUMBER0099.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	http://%HOSTIP:%HTTPPORT/we/want/our/data/%TESTNUMBER0099.txt?coolsite=yes
-	HTTP/1.1 200 Followed here fine swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 41
-
+	HTTP/1.1 200 Followed here fine swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 41
+
	This second URL does not have a location

	</stdout>

tests/data/test1082+9 -9

@@ -10,14 +10,14 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 28 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/plain
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 28 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/plain
+
	-foo-
	</data>
	</reply>
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -4 --interface 127.0.0.1
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1083+9 -9

@@ -11,14 +11,14 @@ IPv6
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 28 Jul 2008 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/plain
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 28 Jul 2008 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/plain
+
	-foo-
	</data>
	</reply>
@@ -46,7 +46,7 @@ HTTP-IPv6 GET with ip6-localhost --interface
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOST6IP:%HTTP6PORT
	User-Agent: curl/%VERSION

tests/data/test1087+47 -47

@@ -13,57 +13,57 @@ followlocation
	#
	# Server-side
	<reply>
-	<data1000 nocheck="yes">
-	HTTP/1.1 401 Authorization Required
-	WWW-Authenticate: Basic
-	Content-Type: text/plain
-	Content-Length: 0
-
+	<data1000 crlf="headers" nocheck="yes">
+	HTTP/1.1 401 Authorization Required
+	WWW-Authenticate: Basic
+	Content-Type: text/plain
+	Content-Length: 0
+
	</data1000>
-	<data1001 nocheck="yes">
-	HTTP/1.1 302 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/plain
-	Funny-head: yesyes
-	Location: http://goto.second.host.now/%TESTNUMBER1002
-	Content-Length: 0
-	Connection: close
-
+	<data1001 crlf="headers" nocheck="yes">
+	HTTP/1.1 302 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/plain
+	Funny-head: yesyes
+	Location: http://goto.second.host.now/%TESTNUMBER1002
+	Content-Length: 0
+	Connection: close
+
	</data1001>
-	<data1002 nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/plain
-	Funny-head: yesyes
-	Content-Length: 9
-
+	<data1002 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/plain
+	Funny-head: yesyes
+	Content-Length: 9
+
	contents
	</data1002>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	WWW-Authenticate: Basic
-	Content-Type: text/plain
-	Content-Length: 0
-
-	HTTP/1.1 302 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/plain
-	Funny-head: yesyes
-	Location: http://goto.second.host.now/%TESTNUMBER1002
-	Content-Length: 0
-	Connection: close
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/plain
-	Funny-head: yesyes
-	Content-Length: 9
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	WWW-Authenticate: Basic
+	Content-Type: text/plain
+	Content-Length: 0
+
+	HTTP/1.1 302 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/plain
+	Funny-head: yesyes
+	Location: http://goto.second.host.now/%TESTNUMBER1002
+	Content-Length: 0
+	Connection: close
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/plain
+	Funny-head: yesyes
+	Content-Length: 9
+
	contents
	</datacheck>
	</reply>
@@ -88,7 +88,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
	Host: first.host.it.is
	User-Agent: curl/%VERSION

tests/data/test1088+47 -47

@@ -14,57 +14,57 @@ followlocation
	#
	# Server-side
	<reply>
-	<data1000 nocheck="yes">
-	HTTP/1.1 401 Authorization Required
-	WWW-Authenticate: Basic
-	Content-Type: text/plain
-	Content-Length: 0
-
+	<data1000 crlf="headers" nocheck="yes">
+	HTTP/1.1 401 Authorization Required
+	WWW-Authenticate: Basic
+	Content-Type: text/plain
+	Content-Length: 0
+
	</data1000>
-	<data1001 nocheck="yes">
-	HTTP/1.1 302 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/plain
-	Funny-head: yesyes
-	Location: http://goto.second.host.now/%TESTNUMBER1002
-	Content-Length: 0
-	Connection: close
-
+	<data1001 crlf="headers" nocheck="yes">
+	HTTP/1.1 302 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/plain
+	Funny-head: yesyes
+	Location: http://goto.second.host.now/%TESTNUMBER1002
+	Content-Length: 0
+	Connection: close
+
	</data1001>
-	<data1003 nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/plain
-	Funny-head: yesyes
-	Content-Length: 9
-
+	<data1003 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/plain
+	Funny-head: yesyes
+	Content-Length: 9
+
	contents
	</data1003>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	WWW-Authenticate: Basic
-	Content-Type: text/plain
-	Content-Length: 0
-
-	HTTP/1.1 302 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/plain
-	Funny-head: yesyes
-	Location: http://goto.second.host.now/%TESTNUMBER1002
-	Content-Length: 0
-	Connection: close
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/plain
-	Funny-head: yesyes
-	Content-Length: 9
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	WWW-Authenticate: Basic
+	Content-Type: text/plain
+	Content-Length: 0
+
+	HTTP/1.1 302 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/plain
+	Funny-head: yesyes
+	Location: http://goto.second.host.now/%TESTNUMBER1002
+	Content-Length: 0
+	Connection: close
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/plain
+	Funny-head: yesyes
+	Content-Length: 9
+
	contents
	</datacheck>
	</reply>
@@ -89,7 +89,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1
	Host: first.host.it.is
	User-Agent: curl/%VERSION

tests/data/test1089+30 -30

@@ -11,23 +11,23 @@ followlocation
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 302 OK swsbounce swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 8
-	Connection: close
-	Content-Type: text/plain
-	Location: ./%TESTNUMBER0001
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 302 OK swsbounce swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 8
+	Connection: close
+	Content-Type: text/plain
+	Location: ./%TESTNUMBER0001
+
	monster
	</data>
-	<data1 nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 15
-	Connection: close
-	Content-Type: text/plain; charset=us-ascii
-
+	<data1 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 15
+	Connection: close
+	Content-Type: text/plain; charset=us-ascii
+
	bigger monster
	</data1>

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

	</protocol>

-	<stdout>
-	HTTP/1.1 302 OK swsbounce swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 8
-	Connection: close
-	Content-Type: text/plain
-	Location: ./%TESTNUMBER0001
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 15
-	Connection: close
-	Content-Type: text/plain; charset=us-ascii
-
+	<stdout crlf="headers">
+	HTTP/1.1 302 OK swsbounce swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 8
+	Connection: close
+	Content-Type: text/plain
+	Location: ./%TESTNUMBER0001
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 15
+	Connection: close
+	Content-Type: text/plain; charset=us-ascii
+
	bigger monster
	2
	1

tests/data/test1090+36 -36

@@ -12,30 +12,30 @@ chunked Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 302 OK swsbounce swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 8
-	Connection: close
-	Content-Type: text/plain
-	Location: ./%TESTNUMBER0001
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 302 OK swsbounce swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 8
+	Connection: close
+	Content-Type: text/plain
+	Location: ./%TESTNUMBER0001
+
	monster
	</data>
-	<data1 nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Transfer-Encoding: chunked
-	Connection: close
-	Content-Type: text/plain; charset=us-ascii
-
-	0007
-	bigger
-	0008
+	<data1 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Transfer-Encoding: chunked
+	Connection: close
+	Content-Type: text/plain; charset=us-ascii
+
+	0007
+	bigger%spc%
+	0008
	monster
-
-	0
-
+
+	0
+
	</data1>

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

	</protocol>

-	<stdout>
-	HTTP/1.1 302 OK swsbounce swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 8
-	Connection: close
-	Content-Type: text/plain
-	Location: ./%TESTNUMBER0001
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Transfer-Encoding: chunked
-	Connection: close
-	Content-Type: text/plain; charset=us-ascii
-
+	<stdout crlf="headers">
+	HTTP/1.1 302 OK swsbounce swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 8
+	Connection: close
+	Content-Type: text/plain
+	Location: ./%TESTNUMBER0001
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Transfer-Encoding: chunked
+	Connection: close
+	Content-Type: text/plain; charset=us-ascii
+
	bigger monster
	2
	1

tests/data/test1092+1 -1

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

tests/data/test1094+5 -5

@@ -16,11 +16,11 @@ data
	returned
	to client
	</data>
-	<datacheck>
-	a chunk of
-	data
-	returned
-	to client
+	<datacheck crlf="yes">
+	a chunk of
+	data
+	returned
+	to client
	</datacheck>
	</reply>

tests/data/test1095+26 -26

@@ -8,39 +8,39 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="test \"this\" realm!!", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="test \"this\" realm!!", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="test \"this\" realm!!", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="test \"this\" realm!!", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test1097+17 -17

@@ -11,29 +11,29 @@ HTTP proxy NTLM auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 We are fine and cool
-	Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
-	Content-Length: 27
-
+	<data crlf="headers">
+	HTTP/1.1 200 We are fine and cool
+	Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
+	Content-Length: 27
+
	This is all fine and dandy
	</data>

	# This is the CONNECT response
-	<connect1001>
-	HTTP/1.1 200 We are fine and cool
-	Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
-
+	<connect1001 crlf="headers">
+	HTTP/1.1 200 We are fine and cool
+	Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
+
	</connect1001>

-	<datacheck>
-	HTTP/1.1 200 We are fine and cool
-	Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
-
-	HTTP/1.1 200 We are fine and cool
-	Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
-	Content-Length: 27
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 We are fine and cool
+	Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
+
+	HTTP/1.1 200 We are fine and cool
+	Server: Apache/1.3.27 (Dorw1n) PHP/44.1.2
+	Content-Length: 27
+
	This is all fine and dandy
	</datacheck>
	</reply>

tests/data/test1098+15 -15

@@ -10,11 +10,11 @@ CURLOPT_PROXY
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+
	hello
	</data>

@@ -43,7 +43,7 @@ ftp://ftp-site/moo/%TESTNUMBER ftp://ftp-site/moo/%TESTNUMBER --proxy http://%HO
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET ftp://ftp-site/moo/%TESTNUMBER HTTP/1.1
	Host: ftp-site:21
	User-Agent: curl/%VERSION
@@ -57,16 +57,16 @@ Accept: /
	Proxy-Connection: Keep-Alive

	</protocol>
-	<stdout>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+
	hello
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+
	hello
	</stdout>
	</verify>

tests/data/test11+1 -1

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

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

tests/data/test1100+34 -34

@@ -9,51 +9,51 @@ HTTP NTLM auth
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 200 Thanks for this! swsclose
-	Content-Length: 25
-
+	<data crlf="headers">
+	HTTP/1.1 200 Thanks for this! swsclose
+	Content-Length: 25
+
	This is the final page !
	</data>

-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 302 Thanks for this, but we want to redir you!
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Location: /%TESTNUMBER
-	Content-Length: 34
-
+	<data1002 crlf="headers">
+	HTTP/1.1 302 Thanks for this, but we want to redir you!
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Location: /%TESTNUMBER
+	Content-Length: 34
+
	This is not the real page either!
	</data1002>

-	<datacheck>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 302 Thanks for this, but we want to redir you!
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Location: /%TESTNUMBER
-	Content-Length: 34
-
-	HTTP/1.1 200 Thanks for this! swsclose
-	Content-Length: 25
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 302 Thanks for this, but we want to redir you!
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Location: /%TESTNUMBER
+	Content-Length: 34
+
+	HTTP/1.1 200 Thanks for this! swsclose
+	Content-Length: 25
+
	This is the final page !
	</datacheck>

tests/data/test1101+8 -8

@@ -11,13 +11,13 @@ NO_PROXY
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 4
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 4
+	Content-Type: text/html
+
	boo
	</data>
	</reply>
@@ -42,7 +42,7 @@ http://user:secret@%HOSTIP:%HTTPPORT/gimme/%TESTNUMBER

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

tests/data/test1104+1 -1

@@ -69,7 +69,7 @@ proxy

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

tests/data/test1105+13 -13

@@ -10,19 +10,19 @@ cookiejar

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes swsclose
-	Set-Cookie: foobar=name;
-	Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
-	Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
-	Set-Cookie: foo%tab%bar=barfoo
-	Set-Cookie: bar%tab%foo=
-	Set-Cookie: bar=foo%tab%bar
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes swsclose
+	Set-Cookie: foobar=name;
+	Set-Cookie: mismatch=this; domain=127.0.0.1; path="/silly/";
+	Set-Cookie: partmatch=present; domain=.0.0.1; path=/;
+	Set-Cookie: foo%tab%bar=barfoo
+	Set-Cookie: bar%tab%foo=
+	Set-Cookie: bar=foo%tab%bar
+
	</data>
	</reply>

tests/data/test1106+8 -8

@@ -9,13 +9,13 @@ HTTP proxy

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Accept-Ranges: bytes
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Accept-Ranges: bytes
+	Content-Length: 6
+
	hello
	</data>
	</reply>
@@ -44,7 +44,7 @@ ftp://%HOSTIP:23456/%TESTNUMBER

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

tests/data/test1109+1 -1

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

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

tests/data/test1110+1 -1

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

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

tests/data/test1111+1 -1

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

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

tests/data/test1115+12 -12

@@ -8,17 +8,17 @@ HTTP 1xx response code

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 104 Experiment
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 200 OK swsbounce
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 104 Experiment
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 200 OK swsbounce
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>

	</reply>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

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

tests/data/test1116+33 -33

@@ -10,33 +10,33 @@ DELAY
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 funky chunky!
-	Server: fakeit/0.9 fakeitbad/1.0
-	Transfer-Encoding: chunked
-	Connection: mooo
-
-	40
-	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-	30
-	bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-	21;heresatest=moooo
+	<data crlf="headers">
+	HTTP/1.1 200 funky chunky!
+	Server: fakeit/0.9 fakeitbad/1.0
+	Transfer-Encoding: chunked
+	Connection: mooo
+
+	40
+	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	30
+	bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	21;heresatest=moooo
	cccccccccccccccccccccccccccccccc
-
-	0
-	chunky-trailer: header data
-	another-header: yes
-
+
+	0
+	chunky-trailer: header data
+	another-header: yes
+
	</data>
-	<datacheck>
-	HTTP/1.1 200 funky chunky!
-	Server: fakeit/0.9 fakeitbad/1.0
-	Transfer-Encoding: chunked
-	Connection: mooo
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 funky chunky!
+	Server: fakeit/0.9 fakeitbad/1.0
+	Transfer-Encoding: chunked
+	Connection: mooo
+
	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccc
-	chunky-trailer: header data
-	another-header: yes
+	chunky-trailer: header data
+	another-header: yes
	</datacheck>
	<servercmd>
	writedelay: 10
@@ -60,21 +60,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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!
-	Server: fakeit/0.9 fakeitbad/1.0
-	Transfer-Encoding: chunked
-	Connection: mooo
-
-	chunky-trailer: header data
-	another-header: yes
+	<file name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 funky chunky!
+	Server: fakeit/0.9 fakeitbad/1.0
+	Transfer-Encoding: chunked
+	Connection: mooo
+
+	chunky-trailer: header data
+	another-header: yes
	</file>
	</verify>

tests/data/test1117+28 -28

@@ -10,24 +10,24 @@ DELAY

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 416 Requested Range Not Satisfiable
-	Date: Tue, 09 Sep 2010 14:49:00 GMT
-	Accept-Ranges: bytes
-	Content-Length: 115
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 416 Requested Range Not Satisfiable
+	Date: Tue, 09 Sep 2010 14:49:00 GMT
+	Accept-Ranges: bytes
+	Content-Length: 115
+
	This is a long error message that is large enough that the test server is
	guaranteed to split it into two packets.
	</data>

-	<data1>
-	HTTP/1.1 206 Partial Content
-	Date: Tue, 09 Sep 2010 14:49:01 GMT
-	Accept-Ranges: bytes
-	Content-Range: bytes 10-18/155
-	Content-Length: 13
-	Content-Type: text/plain
-
+	<data1 crlf="headers">
+	HTTP/1.1 206 Partial Content
+	Date: Tue, 09 Sep 2010 14:49:01 GMT
+	Accept-Ranges: bytes
+	Content-Range: bytes 10-18/155
+	Content-Length: 13
+	Content-Type: text/plain
+
	partial body
	</data1>

@@ -51,25 +51,25 @@ HTTP with invalid range then another URL

	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/1.1 416 Requested Range Not Satisfiable
-	Date: Tue, 09 Sep 2010 14:49:00 GMT
-	Accept-Ranges: bytes
-	Content-Length: 115
-
+	<stdout crlf="headers">
+	HTTP/1.1 416 Requested Range Not Satisfiable
+	Date: Tue, 09 Sep 2010 14:49:00 GMT
+	Accept-Ranges: bytes
+	Content-Length: 115
+
	This is a long error message that is large enough that the test server is
	guaranteed to split it into two packets.
-	HTTP/1.1 206 Partial Content
-	Date: Tue, 09 Sep 2010 14:49:01 GMT
-	Accept-Ranges: bytes
-	Content-Range: bytes 10-18/155
-	Content-Length: 13
-	Content-Type: text/plain
-
+	HTTP/1.1 206 Partial Content
+	Date: Tue, 09 Sep 2010 14:49:01 GMT
+	Accept-Ranges: bytes
+	Content-Range: bytes 10-18/155
+	Content-Length: 13
+	Content-Type: text/plain
+
	partial body
	</stdout>

-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /want/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=10-22

tests/data/test1118+1 -1

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

tests/data/test1121+7 -7

@@ -7,12 +7,12 @@ HTTP
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK
-	Server: test-server/fake
-	Content-Type: text/html
-	Content-Length: 6
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK
+	Server: test-server/fake
+	Content-Type: text/html
+	Content-Length: 6
+
	blaha
	</data>
	</reply>
@@ -34,7 +34,7 @@ HTTP multiple provided Host: headers
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: host1
	User-Agent: curl/%VERSION

tests/data/test1122+19 -19

@@ -10,30 +10,30 @@ Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data nonewline="yes">
-	HTTP/1.1 200 OK swsclose
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip
-	Content-Length: 44
-
+	<data crlf="headers" nonewline="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip
+	Content-Length: 44
+
	%hex[%1f%8b%08%08%79%9e%ab%41%00%03%6c%61%6c%61%6c%61%00%cb%c9%cc%4b%55%30%e4%52%c8%01%d1%46%5c]hex%
	%hex[%10%86%31%17%00]hex%
	%hex[%02%71%60%18%00%00%00]hex%
	</data>

	# This ignore Content-Length
-	<datacheck>
-	HTTP/1.1 200 OK swsclose
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip
-	Content-Length: 44
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip
+	Content-Length: 44
+
	line 1
	line 2
	line 3
@@ -61,7 +61,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1123+1 -1

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

tests/data/test1124+21 -21

@@ -11,30 +11,30 @@ chunked Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2024 21:56:53 GMT
-	Server: Something-TE-friendly/0.1
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
-	2c
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2024 21:56:53 GMT
+	Server: Something-TE-friendly/0.1
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
+	2c
	%hex[%1f%8b%08%08%79%9e%ab%41%00%03%6c%61%6c%61%6c%61%00%cb%c9%cc%4b%55%30%e4%52%c8%01%d1%46%5c]hex%
	%hex[%10%86%31%17%00]hex%
-	%hex[%02%71%60%18%00%00%00]hex%
-	0
-
+	%hex[%02%71%60%18%00%00%00]hex%
+	0
+
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2024 21:56:53 GMT
-	Server: Something-TE-friendly/0.1
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2024 21:56:53 GMT
+	Server: Something-TE-friendly/0.1
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
	line 1
	line 2
	line 3
@@ -62,7 +62,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1125+21 -21

@@ -10,30 +10,30 @@ Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
-	2c
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
+	2c
	%hex[%1f%8b%08%08%79%9e%ab%41%00%03%6c%61%6c%61%6c%61%00%cb%c9%cc%4b%55%30%e4%52%c8%01%d1%46%5c]hex%
	%hex[%10%86%31%17%00]hex%
-	%hex[%02%71%60%18%00%00%00]hex%
-	0
-
+	%hex[%02%71%60%18%00%00%00]hex%
+	0
+
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
	line 1
	line 2
	line 3
@@ -61,7 +61,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: close"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1126+1 -1

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

tests/data/test1127+1 -1

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

tests/data/test1128+1 -1

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

tests/data/test1129+1 -1

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

	-foo-
	</stdout>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	POST /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1130+1 -1

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

	-foo-
	</stdout>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	POST /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1131+1 -1

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

	FAILURE2
	</stdout>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	PUT /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1133+6 -6

@@ -7,12 +7,12 @@ HTTP FORMPOST
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 10
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 10
+
	blablabla
	</data>
	</reply>

tests/data/test1138+4 -4

@@ -9,14 +9,14 @@ followlocation
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 302 OK swsclose
	Location: ../moo.html/?name=%hex[%d8%a2%d8%ba%d8%a7%d8%b2%2d%d8%b3%d9%85%2d%d8%b2%d8%af%d8%a7%db%8c%db%8c%2d%d8%a7%d8%b2%2d%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1%2d%d9%be%d9%88%d9%84]hex%&testcase=/%TESTNUMBER0002
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Connection: close

	</data>
-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK swsclose
	Location: this should be ignored
	Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -24,7 +24,7 @@ Connection: close

	body
	</data2>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 302 OK swsclose
	Location: ../moo.html/?name=%hex[%d8%a2%d8%ba%d8%a7%d8%b2%2d%d8%b3%d9%85%2d%d8%b2%d8%af%d8%a7%db%8c%db%8c%2d%d8%a7%d8%b2%2d%d8%a8%d8%a7%d8%b2%d8%a7%d8%b1%2d%d9%be%d9%88%d9%84]hex%&testcase=/%TESTNUMBER0002
	Date: Tue, 09 Nov 2010 14:49:00 GMT
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1141+1 -1

@@ -54,7 +54,7 @@ proxy

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

tests/data/test1142+1 -1

@@ -49,7 +49,7 @@ proxy

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

tests/data/test1143+1 -1

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

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

tests/data/test1144+1 -1

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

tests/data/test1148+1 -1

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

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

tests/data/test1150+1 -1

@@ -39,7 +39,7 @@ proxy

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

tests/data/test1151+1 -1

@@ -48,7 +48,7 @@ cookies

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

tests/data/test1154+1 -1

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

tests/data/test1155+7 -7

@@ -10,12 +10,12 @@ cookies
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 0
-	Set-Cookie: domain=value;path=/
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 0
+	Set-Cookie: domain=value;path=/
+
	</data>
	</reply>

@@ -37,7 +37,7 @@ cookies

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

tests/data/test1156+22 -22

@@ -11,37 +11,37 @@ Range

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Content-Type: text/html
-	Content-Length: 5
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Content-Type: text/html
+	Content-Length: 5
+
	body
	</data>

-	<data1 nocheck="yes">
-	HTTP/1.1 200 OK
-	Content-Type: text/html
-	Content-Length: 5
-	Content-Range: bytes 3/7
-
+	<data1 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Content-Type: text/html
+	Content-Length: 5
+	Content-Range: bytes 3/7
+
	body
	</data1>

-	<data2 nocheck="yes">
-	HTTP/1.1 416 Requested Range Not Satisfiable
-	Content-Type: text/html
-	Content-Length: 5
-
+	<data2 crlf="headers" nocheck="yes">
+	HTTP/1.1 416 Requested Range Not Satisfiable
+	Content-Type: text/html
+	Content-Length: 5
+
	body
	</data2>

-	<data3 nocheck="yes">
-	HTTP/1.1 416 Requested Range Not Satisfiable
-	Content-Type: text/html
-	Content-Length: 5
-	Content-Range: bytes */2
-
+	<data3 crlf="headers" nocheck="yes">
+	HTTP/1.1 416 Requested Range Not Satisfiable
+	Content-Type: text/html
+	Content-Length: 5
+	Content-Range: bytes */2
+
	body
	</data3>
	</reply>

tests/data/test1157+1 -1

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

tests/data/test1158+6 -6

@@ -7,12 +7,12 @@ HTTP FORMPOST
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 10
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 10
+
	blablabla
	</data>
	</reply>

tests/data/test1159+13 -13

@@ -11,12 +11,12 @@ followlocation

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: ht3p://localhost/
-	Content-Length: 62
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: ht3p://localhost/
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	</data>
	</reply>
@@ -36,19 +36,19 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n'

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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
-	Location: ht3p://localhost/
-	Content-Length: 62
-	Connection: close
-
+	<stdout crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: ht3p://localhost/
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	ht3p://localhost/
	</stdout>

tests/data/test1160+7 -7

@@ -11,12 +11,12 @@ cookies
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 0
-	Set-Cookie: ____________%hex[%ff]hex%= ;%repeat[117 x %20]%%hex[%ff]hex%%repeat[2602 x %20]%%repeat[434 x z]%%hex[%86%85%85%80]hex%%repeat[49 x z]%%hex[%fa]hex%%repeat[540 x z]%%hex[%f3%a0%81%96]hex%zzzzzzzzzzzz~%repeat[82 x z]%%hex[%b6]hex%%repeat[364 x z]%
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 0
+	Set-Cookie: ____________%hex[%ff]hex%= ;%repeat[117 x %20]%%hex[%ff]hex%%repeat[2602 x %20]%%repeat[434 x z]%%hex[%86%85%85%80]hex%%repeat[49 x z]%%hex[%fa]hex%%repeat[540 x z]%%hex[%f3%a0%81%96]hex%zzzzzzzzzzzz~%repeat[82 x z]%%hex[%b6]hex%%repeat[364 x z]%
+
	</data>
	</reply>

@@ -38,7 +38,7 @@ cookies

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

tests/data/test1161+7 -7

@@ -10,12 +10,12 @@ cookies
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 0
-	Set-Cookie: ckyPersistent=permanent;path=;path=/
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 0
+	Set-Cookie: ckyPersistent=permanent;path=;path=/
+
	</data>
	</reply>

@@ -37,7 +37,7 @@ cookies

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

tests/data/test1164+1 -1

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

tests/data/test1166+8 -8

@@ -10,13 +10,13 @@ cookies

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Set-Cookie: trackyou=want; path=/
-	Content-Length: 68
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Set-Cookie: trackyou=want; path=/
+	Content-Length: 68
+
	This server reply is for testing a Location: following with cookies
	</data>
	</reply>
@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUM

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

tests/data/test1168+1 -1

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

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

tests/data/test1170+21 -21

@@ -10,30 +10,30 @@ Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
-	2c
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
+	2c
	%hex[%1f%8b%08%08%79%9e%ab%41%00%03%6c%61%6c%61%6c%61%00%cb%c9%cc%4b%55%30%e4%52%c8%01%d1%46%5c]hex%
	%hex[%10%86%31%17%00]hex%
-	%hex[%02%71%60%18%00%00%00]hex%
-	0
-
+	%hex[%02%71%60%18%00%00%00]hex%
+	0
+
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
	line 1
	line 2
	line 3
@@ -61,7 +61,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection:"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1171+21 -21

@@ -10,30 +10,30 @@ Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
-	2c
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
+	2c
	%hex[%1f%8b%08%08%79%9e%ab%41%00%03%6c%61%6c%61%6c%61%00%cb%c9%cc%4b%55%30%e4%52%c8%01%d1%46%5c]hex%
	%hex[%10%86%31%17%00]hex%
-	%hex[%02%71%60%18%00%00%00]hex%
-	0
-
+	%hex[%02%71%60%18%00%00%00]hex%
+	0
+
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
	line 1
	line 2
	line 3
@@ -61,7 +61,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection;"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1172+1 -1

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

tests/data/test1174+1 -1

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

tests/data/test1176+25 -25

@@ -8,18 +8,18 @@ globbing
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -41,25 +41,25 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o '%LOGDIR/base-#0'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<file name="%LOGDIR/base-#0">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<file name="%LOGDIR/base-#0" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</file>
	</verify>

tests/data/test1178+1 -1

@@ -40,7 +40,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%

tests/data/test1180+1 -1

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

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

tests/data/test1181+7 -7

@@ -8,12 +8,12 @@ HTTP proxy

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Server: Blafasel/5.0
-	Date: Sat, 16 Jan 2021 14:48:30 GMT
-	Content-Length: 12
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Blafasel/5.0
+	Date: Sat, 16 Jan 2021 14:48:30 GMT
+	Content-Length: 12
+
	Bla bla bla
	</data>

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

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

tests/data/test1183+7 -7

@@ -8,12 +8,12 @@ HTTP GET

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Server: Blafasel/5.0
-	Date: Sat, 16 Jan 2021 14:48:30 GMT
-	Content-Length: 12
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Blafasel/5.0
+	Date: Sat, 16 Jan 2021 14:48:30 GMT
+	Content-Length: 12
+
	Bla bla bla
	</data>

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

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

tests/data/test1184+49 -49

@@ -11,29 +11,29 @@ proxytunnel
	#
	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	Server: test tunnel 2000
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Server: test tunnel 2000
+
	</connect>

-	<data nocheck="yes">
-	HTTP/1.1 302 OK
-	Location: http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 9
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 302 OK
+	Location: http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 9
+	Connection: close
+
	contents
	</data>

-	<data2 nocheck="yes">
-	HTTP/1.1 200 OK
-	Content-Length: 7
-
+	<data2 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Content-Length: 7
+
	second
	</data2>
	</reply>
@@ -59,19 +59,19 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
-	CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
+	CONNECT %HOSTIP.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP.%TESTNUMBER:%HTTPPORT
	Accept: /
@@ -83,25 +83,25 @@ Accept: /
	User-Agent: %TESTNUMBER-agent

	</protocol>
-	<stdout>
-	HTTP/1.1 200 Mighty fine indeed
-	Server: test tunnel 2000
-
-	HTTP/1.1 302 OK
-	Location: http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 9
-	Connection: close
-
-	HTTP/1.1 200 Mighty fine indeed
-	Server: test tunnel 2000
-
-	HTTP/1.1 200 OK
-	Content-Length: 7
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Server: test tunnel 2000
+
+	HTTP/1.1 302 OK
+	Location: http://%HOSTIP.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 9
+	Connection: close
+
+	HTTP/1.1 200 Mighty fine indeed
+	Server: test tunnel 2000
+
+	HTTP/1.1 200 OK
+	Content-Length: 7
+
	second
	</stdout>
	</verify>

tests/data/test1186+6 -6

@@ -7,12 +7,12 @@ HTTP FORMPOST
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 10
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 10
+
	blablabla
	</data>
	</reply>

tests/data/test1187+5 -5

@@ -23,11 +23,11 @@ smtp
	<name>
	SMTP multipart with file name escaping
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -F "=This is the mail text" -F '=File content;filename="strange\file\"name"'

tests/data/test1188+6 -6

@@ -9,11 +9,11 @@ HTTP GET

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 404 Not Found
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 404 Not Found
+	Content-Length: 0
+	Connection: close
+
	</data>
	</reply>

@@ -32,7 +32,7 @@ http

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

tests/data/test1189+6 -6

@@ -7,12 +7,12 @@ HTTP FORMPOST
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 10
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 10
+
	blablabla
	</data>
	</reply>

tests/data/test1197+29 -29

@@ -11,23 +11,23 @@ followlocation
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 302 OK swsbounce swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 8
-	Connection: close
-	Content-Type: text/plain
-	Location: ./%TESTNUMBER0001
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 302 OK swsbounce swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 8
+	Connection: close
+	Content-Type: text/plain
+	Location: ./%TESTNUMBER0001
+
	monster
	</data>
-	<data1 nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 15
-	Connection: close
-	Content-Type: text/plain; charset=us-ascii
-
+	<data1 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 15
+	Connection: close
+	Content-Type: text/plain; charset=us-ascii
+
	bigger monster
	</data1>

@@ -65,20 +65,20 @@ Accept: /

	</protocol>

-	<stdout>
-	HTTP/1.1 302 OK swsbounce swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 8
-	Connection: close
-	Content-Type: text/plain
-	Location: ./%TESTNUMBER0001
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 15
-	Connection: close
-	Content-Type: text/plain; charset=us-ascii
-
+	<stdout crlf="headers">
+	HTTP/1.1 302 OK swsbounce swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 8
+	Connection: close
+	Content-Type: text/plain
+	Location: ./%TESTNUMBER0001
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 15
+	Connection: close
+	Content-Type: text/plain; charset=us-ascii
+
	bigger monster
	GET
	</stdout>

tests/data/test12+13 -13

@@ -9,18 +9,18 @@ Content-Range

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 206 Partial Content
-	Date: Mon, 13 Nov 2000 13:41:09 GMT
-	Server: Apache/1.3.11 (Unix) PHP/3.0.14
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 101
-	Content-Range: bytes 100-200/3527
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 206 Partial Content
+	Date: Mon, 13 Nov 2000 13:41:09 GMT
+	Server: Apache/1.3.11 (Unix) PHP/3.0.14
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 101
+	Content-Range: bytes 100-200/3527
+	Connection: close
+	Content-Type: text/html
+
	..partial data returned from the
	server as a result of setting an explicit byte range
	in the request
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -r 100-200

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

tests/data/test1200+4 -4

@@ -9,10 +9,10 @@ INDEX
	#
	# Server-side
	<reply>
-	<data>
-	iMenu results error.host 1
-	0Selector /bar bar.foo.invalid 70
-	.
+	<data crlf="yes">
+	iMenu results error.host 1
+	0Selector /bar bar.foo.invalid 70
+	.
	</data>
	</reply>

tests/data/test1201+4 -4

@@ -9,10 +9,10 @@ SELECTOR
	#
	# Server-side
	<reply>
-	<data>
-	iMenu results error.host 1
-	0Selector /selector/SELECTOR /bar bar.foo.invalid 70
-	.
+	<data crlf="yes">
+	iMenu results error.host 1
+	0Selector /selector/SELECTOR /bar bar.foo.invalid 70
+	.
	</data>
	</reply>

tests/data/test1202+5 -5

@@ -9,11 +9,11 @@ QUERY
	#
	# Server-side
	<reply>
-	<data>
-	iSearch results error.host 1
-	0Query query succeeded /foo foo.bar.invalid 70
-	0Selector /the/search/engine /bar bar.foo.invalid 70
-	.
+	<data crlf="yes">
+	iSearch results error.host 1
+	0Query query succeeded /foo foo.bar.invalid 70
+	0Selector /the/search/engine /bar bar.foo.invalid 70
+	.
	</data>
	</reply>

tests/data/test1203+4 -4

@@ -10,10 +10,10 @@ INDEX
	#
	# Server-side
	<reply>
-	<data>
-	iMenu results error.host 1
-	0Selector /bar bar.foo.invalid 70
-	.
+	<data crlf="yes">
+	iMenu results error.host 1
+	0Selector /bar bar.foo.invalid 70
+	.
	</data>
	</reply>

tests/data/test1204+26 -26

@@ -9,38 +9,38 @@ HTTP Basic auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsbounce
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: X-MobileMe-AuthToken realm="Newcastle", Basic realm="fun fun fun"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsbounce
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: X-MobileMe-AuthToken realm="Newcastle", Basic realm="fun fun fun"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets the second request
-	<data1>
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsbounce
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: X-MobileMe-AuthToken realm="Newcastle", Basic realm="fun fun fun"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsbounce
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: X-MobileMe-AuthToken realm="Newcastle", Basic realm="fun fun fun"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test1205+1 -1

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

tests/data/test1210+1 -1

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

tests/data/test1212+1 -1

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

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

tests/data/test1213+9 -9

@@ -9,14 +9,14 @@ HTTP proxy

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 22
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 22
+
	the content goes here
	</data>
	</reply>
@@ -42,7 +42,7 @@ proxy

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

tests/data/test1214+9 -9

@@ -9,14 +9,14 @@ HTTP proxy

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 22
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 22
+
	the content goes here
	</data>
	</reply>
@@ -42,7 +42,7 @@ proxy

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

tests/data/test1215+1 -1

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

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

tests/data/test1216+4 -4

@@ -10,14 +10,14 @@ cookies

	# Server-side
	<reply>
-	<data>
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Server: Microsoft-IIS/4.0
	Date: Tue, 25 Sep 2001 19:37:44 GMT
	Content-Type: text/html
	Connection: close
-	Content-Length: 21
-
+	Content-Length: 21
+
	This server says moo
	</data>
	</reply>
@@ -47,7 +47,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://example.fake/c/%TESTNUMBER HTTP/1.1
	Host: example.fake
	User-Agent: curl/%VERSION

tests/data/test1218+4 -4

@@ -11,12 +11,12 @@ cookies
	# This test is very similar to 1216, only that it sets the cookies from the
	# first site instead of reading from a file
	<reply>
-	<data>
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 25 Sep 2001 19:37:44 GMT
	Set-Cookie: bug=fixed; domain=.example.fake;
-	Content-Length: 21
-
+	Content-Length: 21
+
	This server says moo
	</data>
	</reply>
@@ -40,7 +40,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://example.fake/c/%TESTNUMBER HTTP/1.1
	Host: example.fake
	User-Agent: curl/%VERSION

tests/data/test1221+5 -5

@@ -11,11 +11,11 @@ HTTP POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 I am cool swsclose
-	Server: Cool server/10.0
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 200 I am cool swsclose
+	Server: Cool server/10.0
+	Content-Length: 0
+
	</data>
	</reply>

tests/data/test1223+1 -1

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

tests/data/test1228+1 -1

@@ -39,7 +39,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://example.fake/hoge/%TESTNUMBER HTTP/1.1
	Host: example.fake
	User-Agent: curl/%VERSION

tests/data/test1229+26 -26

@@ -8,39 +8,39 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test1230+18 -18

@@ -12,28 +12,28 @@ IPv6
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 9
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 9
+
	mooooooo
	</data>

-	<connect>
-	HTTP/1.1 200 welcome dear
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-
+	<connect crlf="headers">
+	HTTP/1.1 200 welcome dear
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+
	</connect>

-	<datacheck>
-	HTTP/1.1 200 welcome dear
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 9
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 welcome dear
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 9
+
	mooooooo
	</datacheck>
	</reply>
@@ -62,7 +62,7 @@ http://[1234:1234:1234::4ce]:%HTTPPORT/wanted/page/%TESTNUMBER -p -x %HOSTIP:%HT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT [1234:1234:1234::4ce]:%HTTPPORT HTTP/1.1
	Host: [1234:1234:1234::4ce]:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1231+1 -1

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

tests/data/test1232+1 -1

@@ -49,7 +49,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1235+28 -28

@@ -9,18 +9,18 @@ globbing
	</info>
	# Server-side
	<reply>
-	<data1>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 15
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 15
+
	the number one
	</data1>
-	<data2>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 16
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 16
+
	two is nice too
	</data2>
	</reply>
@@ -40,7 +40,7 @@ multiple requests using {}{} in the URL

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

	</protocol>
-	<stdout>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 15
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 15
+
	the number one
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 16
-
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 16
+
	two is nice too
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 15
-
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 15
+
	the number one
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 16
-
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 16
+
	two is nice too
	</stdout>
	</verify>

tests/data/test1237+1 -1

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

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

tests/data/test1239+1 -1

@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "-dec 12 12:00:00 1999 GMT" -w '%{respon
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1240+1 -1

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

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

tests/data/test1241+1 -1

@@ -48,7 +48,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1244+1 -1

@@ -50,7 +50,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -x %HOSTIP:%HTTPPORT --next http://%HOSTIP:
	<errorcode>
	56
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1245+9 -9

@@ -13,14 +13,14 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 0
-	Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 301 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 0
+	Location: ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
+	Connection: close
+
	</data>
	</reply>

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

tests/data/test1246+1 -1

@@ -48,7 +48,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://test.remote.haxx.se.%TESTNUMBER:%HTTPPORT/ HTTP/1.1
	Host: test.remote.haxx.se.%TESTNUMBER:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1248+1 -1

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

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

tests/data/test1249+1 -1

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

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

tests/data/test1250+1 -1

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

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

tests/data/test1251+1 -1

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

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

tests/data/test1252+1 -1

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

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

tests/data/test1253+1 -1

@@ -42,7 +42,7 @@ proxy

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

tests/data/test1254+1 -1

@@ -42,7 +42,7 @@ proxy

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

tests/data/test1255+1 -1

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

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

tests/data/test1256+1 -1

@@ -44,7 +44,7 @@ proxy

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

tests/data/test1257+1 -1

@@ -44,7 +44,7 @@ proxy

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

tests/data/test1258+7 -7

@@ -11,12 +11,12 @@ httponly

	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Type: text/html
-	Set-Cookie: I-am=here; domain=localhost;
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Type: text/html
+	Set-Cookie: I-am=here; domain=localhost;
+
	boo
	</data>
	</reply>
@@ -39,7 +39,7 @@ cookies

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

tests/data/test1259+7 -7

@@ -8,12 +8,12 @@ HTTP GET

	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Type: text/html
-	Set-Cookie: I-am=here; domain=localhost;
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Type: text/html
+	Set-Cookie: I-am=here; domain=localhost;
+
	boo
	</data>
	</reply>
@@ -33,7 +33,7 @@ HTTP URL with semicolon in password

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

tests/data/test1261+13 -13

@@ -11,12 +11,12 @@ followlocation

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/10290002.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/10290002.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	</data>
	</reply>
@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w '%{redirect_url}\n' --locati

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/our/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -47,12 +47,12 @@ Accept: /
	<errorcode>
	47
	</errorcode>
-	<stdout>
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/10290002.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	<stdout crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/10290002.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	http://%HOSTIP:%HTTPPORT/we/want/our/data/10290002.txt?coolsite=yes
	</stdout>
	</verify>

tests/data/test1265+1 -1

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

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

tests/data/test1266+1 -1

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

tests/data/test1267+1 -1

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

tests/data/test1270+25 -25

@@ -11,18 +11,18 @@ followlocation

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 302 Captive Portal
-	Server: ohlala/2000
-	Date: Tue, 17 Dec 2019 13:08:30 GMT
-	Cache-Control: no-cache,no-store,must-revalidate,post-check=0,pre-check=0
-	Location: https://moo.moo.moo
-	Content-Type: text/html; charset=utf-8
-	X-Frame-Options: SAMEORIGIN
-	Strict-Transport-Security: max-age=604800
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 302 Captive Portal
+	Server: ohlala/2000
+	Date: Tue, 17 Dec 2019 13:08:30 GMT
+	Cache-Control: no-cache,no-store,must-revalidate,post-check=0,pre-check=0
+	Location: https://moo.moo.moo
+	Content-Type: text/html; charset=utf-8
+	X-Frame-Options: SAMEORIGIN
+	Strict-Transport-Security: max-age=604800
+	Content-Length: 0
+	Connection: close
+
	</data>
	</reply>

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

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

	</protocol>

-	<stdout>
-	HTTP/1.1 302 Captive Portal
-	Server: ohlala/2000
-	Date: Tue, 17 Dec 2019 13:08:30 GMT
-	Cache-Control: no-cache,no-store,must-revalidate,post-check=0,pre-check=0
-	Location: https://moo.moo.moo
-	Content-Type: text/html; charset=utf-8
-	X-Frame-Options: SAMEORIGIN
-	Strict-Transport-Security: max-age=604800
-	Content-Length: 0
-	Connection: close
-
+	<stdout crlf="headers">
+	HTTP/1.1 302 Captive Portal
+	Server: ohlala/2000
+	Date: Tue, 17 Dec 2019 13:08:30 GMT
+	Cache-Control: no-cache,no-store,must-revalidate,post-check=0,pre-check=0
+	Location: https://moo.moo.moo
+	Content-Type: text/html; charset=utf-8
+	X-Frame-Options: SAMEORIGIN
+	Strict-Transport-Security: max-age=604800
+	Content-Length: 0
+	Connection: close
+
	https://moo.moo.moo/
	</stdout>
	</verify>

tests/data/test1271+6 -6

@@ -9,11 +9,11 @@ HTTP GET

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 This is a weirdo text message swsclose
-	Content-Length: 4
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 This is a weirdo text message swsclose
+	Content-Length: 4
+	Connection: close
+
	Moo
	</data>
	</reply>
@@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @%LOGDIR/blank%TESTNUMBER

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

tests/data/test1273+6 -6

@@ -11,11 +11,11 @@ Resume

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 416 Invalid range
-	Connection: close
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 416 Invalid range
+	Connection: close
+	Content-Length: 0
+
	</data>

	# The file data that exists at the start of the test must be included in
@@ -69,7 +69,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - -f

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

tests/data/test1274+13 -13

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

	</protocol>
-	<file name="%LOGDIR/out%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/
-	fake
-	folded
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Content-Length: 6
-	Connection:
-	close
-
+	<file name="%LOGDIR/out%TESTNUMBER" crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/
+	fake
+	folded
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Content-Length: 6
+	Connection:%repeat[46 x ]%
+	close
+
	</file>
	</verify>
	</testcase>

tests/data/test1277+1 -1

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

tests/data/test1278+1 -1

@@ -8,7 +8,7 @@
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1280+7 -7

@@ -8,12 +8,12 @@ globbing
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+
	bytes
	</data>
	</reply>
@@ -33,7 +33,7 @@ http://%HOSTIP:%HTTPPORT/[a-d]/%TESTNUMBER

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

tests/data/test1283+13 -13

@@ -11,12 +11,12 @@ globbing
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+
	bytes
	</data>
	</reply>
@@ -36,19 +36,19 @@ 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 crlf="yes">
+	<protocol crlf="headers">
	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
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-
+	<file name="%LOGDIR/outfile%TESTNUMBER_a1b2.dump" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+
	bytes
	</file>
	</verify>

tests/data/test1284+25 -25

@@ -9,35 +9,35 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test1285+25 -25

@@ -9,35 +9,35 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test1286+39 -39

@@ -10,48 +10,48 @@ followlocation

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", qop="auth"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", qop="auth"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 302 Thanks for this, but we want to redir you!
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Location: /%TESTNUMBER0001
-	Content-Length: 0
-
+	<data1000 crlf="headers">
+	HTTP/1.1 302 Thanks for this, but we want to redir you!
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Location: /%TESTNUMBER0001
+	Content-Length: 0
+
	</data1000>
-	<data1001>
-	HTTP/1.1 404 Not Found
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data1001 crlf="headers">
+	HTTP/1.1 404 Not Found
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data1001>

-	<datacheck>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", qop="auth"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 302 Thanks for this, but we want to redir you!
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Location: /%TESTNUMBER0001
-	Content-Length: 0
-
-	HTTP/1.1 404 Not Found
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", qop="auth"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 302 Thanks for this, but we want to redir you!
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Location: /%TESTNUMBER0001
+	Content-Length: 0
+
+	HTTP/1.1 404 Not Found
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</datacheck>

	</reply>
@@ -89,7 +89,7 @@ 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 crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1287+32 -32

@@ -11,38 +11,38 @@ verbose logs
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 9
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 9
+
	contents
	</data>

	# The purpose of this test is to make sure curl ignores headers
	# Content-Length and Transfer-Encoding in a successful CONNECT 2xx reply.
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	Content-Length: 123
-	Transfer-Encoding: chunked
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Content-Length: 123
+	Transfer-Encoding: chunked
+
	</connect>

-	<datacheck>
-	HTTP/1.1 200 Mighty fine indeed
-	Content-Length: 123
-	Transfer-Encoding: chunked
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 9
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Content-Length: 123
+	Transfer-Encoding: chunked
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 9
+
	contents
	</datacheck>
	</reply>
@@ -69,14 +69,14 @@ verbose-strings
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: test.%TESTNUMBER:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1288+20 -20

@@ -12,21 +12,21 @@ proxytunnel
	#
	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	Server: test tunnel 2000
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Server: test tunnel 2000
+
	</connect>

-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 9
-	Connection: keep-alive
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 9
+	Connection: keep-alive
+
	contents
	</data>
	</reply>
@@ -52,14 +52,14 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT %HOSTIP:%HTTPPORT HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT %HOSTIP:%HTTPPORT HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test129+1 -1

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

tests/data/test1290+1 -1

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

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

tests/data/test1296+1 -1

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

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

tests/data/test1297+11 -11

@@ -12,10 +12,10 @@ proxytunnel
	#
	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	Server: test tunnel 2000
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Server: test tunnel 2000
+
	</connect>

	<data nocheck="yes">
@@ -43,14 +43,14 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT %HOSTIP:%HTTPPORT HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT %HOSTIP:%HTTPPORT HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1298+1 -1

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

tests/data/test13+6 -6

@@ -7,11 +7,11 @@ HTTP custom request
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 Read you
-	Content-Length: 29
-	Deleted: suppose we got a header like this! ;-)
-
+	<data crlf="headers">
+	HTTP/1.1 200 Read you
+	Content-Length: 29
+	Deleted: suppose we got a header like this! ;-)
+
	blabla custom request result
	</data>
	</reply>
@@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -X DELETE

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

tests/data/test1310+1 -1

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

tests/data/test1311+1 -1

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

tests/data/test1312+1 -1

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

tests/data/test1313+1 -1

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

tests/data/test1314+1 -1

@@ -63,7 +63,7 @@ proxy

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

tests/data/test1316+4 -4

@@ -13,10 +13,10 @@ HTTP proxy
	# Server-side
	<reply>

-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	Magic: sure you can FTP me
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Magic: sure you can FTP me
+
	</connect>

	<data mode="text">

tests/data/test1317+1 -1

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

tests/data/test1318+1 -1

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

tests/data/test1319+10 -10

@@ -12,10 +12,10 @@ HTTP proxy
	# Server-side
	<reply>

-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	pop3: sure hit me
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	pop3: sure hit me
+
	</connect>

	# When doing LIST, we get the default list output hard-coded in the test
@@ -70,12 +70,12 @@ PASS secret
	RETR %TESTNUMBER
	QUIT
	</protocol>
-	<proxy>
-	CONNECT pop.%TESTNUMBER:%POP3PORT HTTP/1.1
-	Host: pop.%TESTNUMBER:%POP3PORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT pop.%TESTNUMBER:%POP3PORT HTTP/1.1
+	Host: pop.%TESTNUMBER:%POP3PORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
	</verify>
	</testcase>

tests/data/test1320+15 -15

@@ -11,10 +11,10 @@ HTTP proxy
	#
	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	smtp: sure hit me
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	smtp: sure hit me
+
	</connect>
	</reply>

@@ -32,11 +32,11 @@ proxy
	<name>
	SMTP send tunneled through HTTP proxy
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://smtp.%TESTNUMBER:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -T - -p -x %HOSTIP:%PROXYPORT
@@ -60,12 +60,12 @@ To: another
	body
	.
	</upload>
-	<proxy>
-	CONNECT smtp.%TESTNUMBER:%SMTPPORT HTTP/1.1
-	Host: smtp.%TESTNUMBER:%SMTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT smtp.%TESTNUMBER:%SMTPPORT HTTP/1.1
+	Host: smtp.%TESTNUMBER:%SMTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
	</verify>
	</testcase>

tests/data/test1321+26 -26

@@ -12,28 +12,28 @@ HTTP proxy
	#
	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	imap: sure hit me
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	imap: sure hit me
+
	</connect>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
-	<datacheck>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<datacheck crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</datacheck>
	</reply>

@@ -66,12 +66,12 @@ A003 SELECT %TESTNUMBER
	A004 FETCH 1 BODY[]
	A005 LOGOUT
	</protocol>
-	<proxy>
-	CONNECT imap.%TESTNUMBER:%IMAPPORT HTTP/1.1
-	Host: imap.%TESTNUMBER:%IMAPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT imap.%TESTNUMBER:%IMAPPORT HTTP/1.1
+	Host: imap.%TESTNUMBER:%IMAPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
	</verify>
	</testcase>

tests/data/test1322+1 -1

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

tests/data/test1324+1 -1

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

tests/data/test1325+23 -23

@@ -11,32 +11,32 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 308 OK swsclose
-	Location: %TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 308 OK swsclose
+	Location: %TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 308 OK swsclose
-	Location: %TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 308 OK swsclose
+	Location: %TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</datacheck>
	</reply>

tests/data/test1326+4 -4

@@ -28,9 +28,9 @@ telnet
	<name>
	TELNET to HTTP server
	</name>
-	<stdin>
-	GET /we/want/%TESTNUMBER HTTP/1.0
-
+	<stdin crlf="headers">
+	GET /we/want/%TESTNUMBER HTTP/1.0
+
	</stdin>
	<command>
	telnet://%HOSTIP:%HTTPPORT --upload-file -
@@ -40,7 +40,7 @@ telnet://%HOSTIP:%HTTPPORT --upload-file -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/%TESTNUMBER HTTP/1.0

	</protocol>

tests/data/test1327+7 -7

@@ -23,13 +23,13 @@ telnet
	<name>
	TELNET check of upload with stdout redirected
	</name>
-	<stdin>
-	GET /ignore/for/%TESTNUMBER HTTP/1.0
-
+	<stdin crlf="headers">
+	GET /ignore/for/%TESTNUMBER HTTP/1.0
+
	</stdin>
-	<file name="%LOGDIR/%TESTNUMBER.txt">
-	GET /we/want/%TESTNUMBER HTTP/1.0
-
+	<file name="%LOGDIR/%TESTNUMBER.txt" crlf="headers">
+	GET /we/want/%TESTNUMBER HTTP/1.0
+
	</file>
	<command option="no-output">
	telnet://%HOSTIP:%HTTPPORT -T %LOGDIR/%TESTNUMBER.txt
@@ -39,7 +39,7 @@ telnet://%HOSTIP:%HTTPPORT -T %LOGDIR/%TESTNUMBER.txt
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/%TESTNUMBER HTTP/1.0

	</protocol>

tests/data/test1328+1 -1

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

tests/data/test1331+28 -28

@@ -14,39 +14,39 @@ cookies

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 407 Me not know you swsbounce
-	Date: Tue, 25 Sep 2001 19:37:44 GMT
-	Content-Type: text/html
-	Set-Cookie: proxycookie=weirdo; Path=/
-	Cache-control: private
-	Content-Length: 62
-	Proxy-Authenticate: Basic realm="moo on you"
-
+	<data crlf="headers">
+	HTTP/1.1 407 Me not know you swsbounce
+	Date: Tue, 25 Sep 2001 19:37:44 GMT
+	Content-Type: text/html
+	Set-Cookie: proxycookie=weirdo; Path=/
+	Cache-control: private
+	Content-Length: 62
+	Proxy-Authenticate: Basic realm="moo on you"
+
	This server reply is for testing a simple cookie test case...
	</data>

-	<data1>
-	HTTP/1.1 200 Fine!
-	Content-Type: text/html
-	Content-Length: 6
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 Fine!
+	Content-Type: text/html
+	Content-Length: 6
+
	hello
	</data1>

-	<datacheck>
-	HTTP/1.1 407 Me not know you swsbounce
-	Date: Tue, 25 Sep 2001 19:37:44 GMT
-	Content-Type: text/html
-	Set-Cookie: proxycookie=weirdo; Path=/
-	Cache-control: private
-	Content-Length: 62
-	Proxy-Authenticate: Basic realm="moo on you"
-
-	HTTP/1.1 200 Fine!
-	Content-Type: text/html
-	Content-Length: 6
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Me not know you swsbounce
+	Date: Tue, 25 Sep 2001 19:37:44 GMT
+	Content-Type: text/html
+	Set-Cookie: proxycookie=weirdo; Path=/
+	Cache-control: private
+	Content-Length: 62
+	Proxy-Authenticate: Basic realm="moo on you"
+
+	HTTP/1.1 200 Fine!
+	Content-Type: text/html
+	Content-Length: 6
+
	hello
	</datacheck>

@@ -72,7 +72,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://z.x.com/%TESTNUMBER HTTP/1.1
	Host: z.x.com
	User-Agent: curl/%VERSION

tests/data/test1334+17 -17

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -49,14 +49,14 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1335+17 -17

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir="%LOGDIR"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -49,14 +49,14 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	</verify>

tests/data/test1336+19 -19

@@ -8,15 +8,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER --output-dir
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -50,15 +50,15 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1337+19 -19

@@ -8,15 +8,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -50,15 +50,15 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>
	<notexists>>
	%LOGDIR/name%TESTNUMBER

tests/data/test1338+17 -17

@@ -9,14 +9,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER --output-
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -50,14 +50,14 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1339+17 -17

@@ -9,14 +9,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -50,14 +50,14 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	</verify>

tests/data/test1340+19 -19

@@ -9,15 +9,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER -w "curl
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -51,15 +51,15 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER" mode="text">

tests/data/test1341+19 -19

@@ -9,15 +9,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl saved to filename %{fil
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -51,15 +51,15 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	curl saved to filename %LOGDIR/name%TESTNUMBER
	</file2>

tests/data/test1342+25 -25

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -45,25 +45,25 @@ Accept: /

	</protocol>

-	<file1 name="%LOGDIR/%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file1 name="%LOGDIR/%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1343+25 -25

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -45,25 +45,25 @@ Accept: /

	</protocol>

-	<file1 name="%LOGDIR/%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file1 name="%LOGDIR/%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	</verify>

tests/data/test1344+28 -28

@@ -8,15 +8,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER --output-
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -46,27 +46,27 @@ Accept: /

	</protocol>

-	<file1 name="%LOGDIR/%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1345+28 -28

@@ -8,15 +8,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -46,27 +46,27 @@ Accept: /

	</protocol>

-	<file1 name="%LOGDIR/%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>
	<notexists>
	%LOGDIR/name%TESTNUMBER

tests/data/test1346+17 -17

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -45,14 +45,14 @@ Accept: /

	</protocol>

-	<file1 name="%LOGDIR/%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file1 name="%LOGDIR/%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</file1>

tests/data/test1347+19 -19

@@ -8,15 +8,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -46,15 +46,15 @@ Accept: /

	</protocol>

-	<file1 name="%LOGDIR/%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</file1>

tests/data/test1349+15 -15

@@ -48,21 +48,21 @@ mooo

	# The final "221 bye bye baby" response to QUIT will not be recorded
	# since that is not considered part of this particular transfer!
-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1350+15 -15

@@ -48,21 +48,21 @@ mooo

	# The final "221 bye bye baby" response to QUIT will not be recorded
	# since that is not considered part of this particular transfer!
-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1351+15 -15

@@ -49,21 +49,21 @@ mooo

	# The final "221 bye bye baby" response to QUIT will not be recorded
	# since that is not considered part of this particular transfer!
-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1352+15 -15

@@ -49,21 +49,21 @@ mooo

	# The final "221 bye bye baby" response to QUIT will not be recorded
	# since that is not considered part of this particular transfer!
-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1353+15 -15

@@ -48,21 +48,21 @@ mooo

	# The final "221 bye bye baby" response to QUIT will not be recorded
	# since that is not considered part of this particular transfer!
-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1354+15 -15

@@ -46,21 +46,21 @@ fooo
	mooo
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1356+18 -18

@@ -9,15 +9,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -49,15 +49,15 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/file%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/file%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

tests/data/test1357+15 -15

@@ -61,21 +61,21 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 214
-	150 Binary data connection for %TESTNUMBER () (214 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 214
+	150 Binary data connection for %TESTNUMBER () (214 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1358+15 -15

@@ -61,21 +61,21 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 214
-	150 Binary data connection for %TESTNUMBER () (214 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 214
+	150 Binary data connection for %TESTNUMBER () (214 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1359+15 -15

@@ -62,21 +62,21 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 214
-	150 Binary data connection for %TESTNUMBER () (214 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 214
+	150 Binary data connection for %TESTNUMBER () (214 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1360+15 -15

@@ -62,21 +62,21 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 214
-	150 Binary data connection for %TESTNUMBER () (214 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 214
+	150 Binary data connection for %TESTNUMBER () (214 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1361+15 -15

@@ -61,21 +61,21 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 214
-	150 Binary data connection for %TESTNUMBER () (214 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 214
+	150 Binary data connection for %TESTNUMBER () (214 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1362+15 -15

@@ -61,21 +61,21 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 214
-	150 Binary data connection for %TESTNUMBER () (214 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 214
+	150 Binary data connection for %TESTNUMBER () (214 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1363+18 -18

@@ -9,15 +9,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -49,15 +49,15 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/file%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/file%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

tests/data/test1364+17 -17

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/he
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -49,14 +49,14 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1365+17 -17

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -49,14 +49,14 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	<notexists>

tests/data/test1366+19 -19

@@ -8,15 +8,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/he
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -50,15 +50,15 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1367+19 -19

@@ -8,15 +8,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -50,15 +50,15 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>

	<notexists>

tests/data/test1368+17 -17

@@ -9,14 +9,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -50,14 +50,14 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1369+17 -17

@@ -9,14 +9,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -50,14 +50,14 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	<notexists>

tests/data/test1370+19 -19

@@ -9,15 +9,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -51,15 +51,15 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1371+19 -19

@@ -9,15 +9,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -51,15 +51,15 @@ Accept: /
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>

	<notexists>

tests/data/test1372+25 -25

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -45,25 +45,25 @@ Accept: /

	</protocol>

-	<file1 name="%LOGDIR/outfile%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file1 name="%LOGDIR/outfile%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1373+25 -25

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</data>
	</reply>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -45,25 +45,25 @@ Accept: /

	</protocol>

-	<file1 name="%LOGDIR/outfile%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file1 name="%LOGDIR/outfile%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	</file2>

	<notexists>

tests/data/test1374+28 -28

@@ -8,15 +8,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -46,27 +46,27 @@ Accept: /

	</protocol>

-	<file1 name="%LOGDIR/outfile%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/outfile%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1375+19 -19

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

	</protocol>

-	<file1 name="%LOGDIR/outfile%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/outfile%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	</file2>

	<notexists>

tests/data/test1376+9 -9

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

	</protocol>

-	<file1 name="%LOGDIR/outfile%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<file1 name="%LOGDIR/outfile%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	12345
	</file1>

tests/data/test1377+10 -10

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

	</protocol>

-	<file1 name="%LOGDIR/outfile%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/outfile%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	12345
	</file1>

tests/data/test1379+15 -15

@@ -46,21 +46,21 @@ fooo
	mooo
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1380+15 -15

@@ -46,21 +46,21 @@ fooo
	mooo
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1381+15 -15

@@ -47,21 +47,21 @@ fooo
	mooo
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1382+15 -15

@@ -47,21 +47,21 @@ fooo
	mooo
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1383+15 -15

@@ -46,21 +46,21 @@ fooo
	mooo
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1384+15 -15

@@ -46,21 +46,21 @@ fooo
	mooo
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 10
-	150 Binary data connection for %TESTNUMBER () (10 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 10
+	150 Binary data connection for %TESTNUMBER () (10 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1386+18 -18

@@ -9,15 +9,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -49,15 +49,15 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/download%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/download%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

tests/data/test1387+33 -33

@@ -9,15 +9,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -49,33 +49,33 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/download%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/download%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 222
-	150 Binary data connection for %TESTNUMBER () (222 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 222
+	150 Binary data connection for %TESTNUMBER () (222 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1388+33 -33

@@ -9,15 +9,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -49,33 +49,33 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/download%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/download%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 222
-	150 Binary data connection for %TESTNUMBER () (222 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 222
+	150 Binary data connection for %TESTNUMBER () (222 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1389+34 -34

@@ -10,15 +10,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -50,36 +50,36 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/download%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/download%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 222
-	150 Binary data connection for %TESTNUMBER () (222 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 222
+	150 Binary data connection for %TESTNUMBER () (222 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
-	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/
+	s/^(229 Entering Passive Mode $).($\S)/${1}stripped${2}/
	</stripfile2>

	<file3 name="%LOGDIR/stdout%TESTNUMBER">

tests/data/test1390+33 -33

@@ -10,15 +10,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -50,33 +50,33 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/download%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/download%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 222
-	150 Binary data connection for %TESTNUMBER () (222 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 222
+	150 Binary data connection for %TESTNUMBER () (222 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1391+33 -33

@@ -9,15 +9,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -49,33 +49,33 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/download%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/download%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/heads%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 222
-	150 Binary data connection for %TESTNUMBER () (222 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/heads%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 222
+	150 Binary data connection for %TESTNUMBER () (222 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1392+33 -33

@@ -9,15 +9,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -49,33 +49,33 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/download%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/download%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

-	<file2 name="%LOGDIR/stdout%TESTNUMBER">
-	220- _ _ ____ _
-	220- ___\| \| \| \| _ \\| \|
-	220- / __\| \| \| \| \|_) \| \|
-	220- \| (__\| \|_\| \| _ {\| \|___
-	220 \___\|\___/\|_\| \_\_____\|
-	331 We are happy you popped in!
-	230 Welcome you silly person
-	257 "/" is current directory
-	250 CWD command successful.
-	229 Entering Passive Mode (stripped)
-	200 I modify TYPE as you wanted
-	213 222
-	150 Binary data connection for %TESTNUMBER () (222 bytes).
-	226 File transfer complete
+	<file2 name="%LOGDIR/stdout%TESTNUMBER" crlf="yes">
+	220- _ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	220- ___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	220- / __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	220- \| (__\| \|_\| \| _ {\| \|___%spc%
+	220 \___\|\___/\|_\| \_\_____\|
+	331 We are happy you popped in!
+	230 Welcome you silly person
+	257 "/" is current directory
+	250 CWD command successful.
+	229 Entering Passive Mode (stripped)
+	200 I modify TYPE as you wanted
+	213 222
+	150 Binary data connection for %TESTNUMBER () (222 bytes).
+	226 File transfer complete
	</file2>
	<stripfile2>
	s/^(229 Entering Passive Mode $).($.)/${1}stripped${2}/

tests/data/test1393+18 -18

@@ -9,15 +9,15 @@ RETR
	# Server-side
	<reply>
	# file%TESTNUMBER contents...
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</data>
	</reply>
@@ -49,15 +49,15 @@ RETR file%TESTNUMBER
	QUIT
	</protocol>

-	<file1 name="%LOGDIR/download%TESTNUMBER">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
-
+	<file1 name="%LOGDIR/download%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
+
	MOOOO
	</file1>

tests/data/test14+1 -1

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

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

tests/data/test1400+1 -1

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

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

tests/data/test1401+1 -1

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

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[fake:user]b64%

tests/data/test1403+1 -1

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

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/%TESTNUMBER?foo=bar&baz=quux HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1406+6 -6

@@ -12,7 +12,7 @@ SMTP
	# Server-side
	<reply>
	<servercmd>
-	CAPA SIZE
+	CAPA SIZE
	</servercmd>
	</reply>

@@ -28,11 +28,11 @@ smtp
	<setenv>
	SSL_CERT_FILE
	</setenv>
-	<file name="%LOGDIR/test%TESTNUMBER.eml">
-	From: different
-	To: another
-
-	body
+	<file name="%LOGDIR/test%TESTNUMBER.eml" crlf="yes">
+	From: different
+	To: another
+
+	body
	</file>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-from [email protected] -T %LOGDIR/test%TESTNUMBER.eml --libcurl %LOGDIR/test%TESTNUMBER.c

tests/data/test1407+1 -1

@@ -3,7 +3,7 @@
	<info>
	<keywords>
	POP3
-	Clear Text
+	Clear Text
	LIST
	--libcurl
	</keywords>

tests/data/test1408+1 -1

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

tests/data/test141+4 -4

@@ -43,10 +43,10 @@ SIZE %TESTNUMBER
	REST 0
	QUIT
	</protocol>
-	<stdout>
-	Last-Modified: Wed, 09 Apr 2003 10:26:59 GMT
-	Content-Length: 42
-	Accept-ranges: bytes
+	<stdout crlf="headers">
+	Last-Modified: Wed, 09 Apr 2003 10:26:59 GMT
+	Content-Length: 42
+	Accept-ranges: bytes
	</stdout>
	</verify>
	</testcase>

tests/data/test1411+1 -1

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

tests/data/test1412+48 -48

@@ -13,69 +13,69 @@ HTTP Digest auth
	<servercmd>
	auth_required
	</servercmd>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# The second URL will get this response
-	<data1>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data1 crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data1>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-	Connection: close
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</data1000>

	# This is the second request
-	<data1001>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-	Connection: close
-
+	<data1001 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+	Connection: close
+
	This IS the second real page!
	</data1001>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test1413+24 -24

@@ -9,32 +9,32 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 OK swsclose
-	Location: moo.html/%TESTNUMBER0002#fragmentpart
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 302 OK swsclose
+	Location: moo.html/%TESTNUMBER0002#fragmentpart
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 302 OK swsclose
-	Location: moo.html/%TESTNUMBER0002#fragmentpart
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 302 OK swsclose
+	Location: moo.html/%TESTNUMBER0002#fragmentpart
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</datacheck>
	</reply>
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/this/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /this/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1415+1 -1

@@ -64,7 +64,7 @@ proxy

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

tests/data/test1416+1 -1

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

tests/data/test1417+9 -9

@@ -56,21 +56,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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!
-	Server: fakeit/0.9 fakeitbad/1.0
-	Transfer-Encoding: chunked
-	Trailer: chunky-trailer
-	Connection: mooo
-
-	chunky-trailer: header data
+	<file name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 funky chunky!
+	Server: fakeit/0.9 fakeitbad/1.0
+	Transfer-Encoding: chunked
+	Trailer: chunky-trailer
+	Connection: mooo
+
+	chunky-trailer: header data
	</file>
	</verify>

tests/data/test1418+38 -38

@@ -13,62 +13,62 @@ connection reuse
	connection-monitor
	</servercmd>

-	<data>
-	HTTP/1.1 401 Authentication please!
-	Content-Length: 20
-	WWW-Authenticate: Digest realm="loonie", nonce="314156592"
-	WWW-Authenticate: Basic
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authentication please!
+	Content-Length: 20
+	WWW-Authenticate: Digest realm="loonie", nonce="314156592"
+	WWW-Authenticate: Basic
+
	Please auth with me
	</data>

-	<data3>
-	HTTP/1.1 401 Authentication please!
-	Content-Length: 20
-	WWW-Authenticate: Digest realm="loonie", nonce="314156592"
-	WWW-Authenticate: Basic
-
+	<data3 crlf="headers">
+	HTTP/1.1 401 Authentication please!
+	Content-Length: 20
+	WWW-Authenticate: Digest realm="loonie", nonce="314156592"
+	WWW-Authenticate: Basic
+
	Please auth with me
	</data3>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Length: 4
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Length: 4
+
	moo
	</data1000>

-	<data1003>
-	HTTP/1.1 200 OK
-	Server: Another one/1.0
-	Content-Length: 4
-
+	<data1003 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Another one/1.0
+	Content-Length: 4
+
	boo
	</data1003>

	# This is the first reply after the redirection
-	<data1011>
-	HTTP/1.1 200 OK
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-
+	<data1011 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+
	This is not the real page either!
	</data1011>

-	<datacheck>
-	HTTP/1.1 401 Authentication please!
-	Content-Length: 20
-	WWW-Authenticate: Digest realm="loonie", nonce="314156592"
-	WWW-Authenticate: Basic
-
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Length: 4
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authentication please!
+	Content-Length: 20
+	WWW-Authenticate: Digest realm="loonie", nonce="314156592"
+	WWW-Authenticate: Basic
+
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Length: 4
+
	moo
	</datacheck>

tests/data/test1419+13 -13

@@ -13,25 +13,25 @@ connection reuse
	connection-monitor
	</servercmd>

-	<data>
-	HTTP/1.1 200 fine!
-	Content-Length: 20
-
+	<data crlf="headers">
+	HTTP/1.1 200 fine!
+	Content-Length: 20
+
	Feel free to get it
	</data>

-	<data3>
-	HTTP/1.1 200 OK
-	Server: Another one/1.0
-	Content-Length: 4
-
+	<data3 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Another one/1.0
+	Content-Length: 4
+
	boo
	</data3>

-	<datacheck>
-	HTTP/1.1 200 fine!
-	Content-Length: 20
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 fine!
+	Content-Length: 20
+
	Feel free to get it
	</datacheck>
	</reply>

tests/data/test1420+9 -9

@@ -3,7 +3,7 @@
	<info>
	<keywords>
	IMAP
-	Clear Text
+	Clear Text
	FETCH
	--libcurl
	</keywords>
@@ -12,14 +12,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>

tests/data/test1422+10 -10

@@ -9,15 +9,15 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 0
-	Connection: close
-	Content-Type: text/html
-	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=str//nge
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 0
+	Connection: close
+	Content-Type: text/html
+	Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=str//nge
+
	</data>
	</reply>

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

tests/data/test1423+9 -9

@@ -8,14 +8,14 @@ HTTP GET

	#
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 0
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 0
+	Connection: close
+	Content-Type: text/html
+
	</data>
	</reply>

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

tests/data/test1424+1 -1

@@ -57,7 +57,7 @@ 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 crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1425+1 -1

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

tests/data/test1426+1 -1

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

tests/data/test1428+11 -11

@@ -21,9 +21,9 @@ Content-Length: 9

	contents
	</data>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+
	</connect>
	<datacheck>
	HTTP/1.1 200 Mighty fine indeed
@@ -60,15 +60,15 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-	header-type: proxy
-
+	<proxy crlf="headers">
+	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+	header-type: proxy
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: test.%TESTNUMBER:%HTTPPORT
	Authorization: Basic %b64[iam:my:;self]b64%

tests/data/test1429+13 -13

@@ -42,22 +42,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{response_code}'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout nonewline="yes">
-	HTTP/1.1 999 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<stdout crlf="headers" nonewline="yes">
+	HTTP/1.1 999 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	999
	</stdout>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1430+1 -1

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

tests/data/test1431+1 -1

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

tests/data/test1432+1 -1

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

tests/data/test1433+1 -1

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

tests/data/test1434+1 -1

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

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

tests/data/test1435+1 -1

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

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

tests/data/test1436+1 -1

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

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0001 HTTP/1.1
	Host: one.example.com
	User-Agent: curl/%VERSION

tests/data/test1437+26 -26

@@ -8,39 +8,39 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, algorithm=MD5, nonce=1, nonce=2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, algorithm=MD5, nonce=1, nonce=2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, algorithm=MD5, nonce=1, nonce=2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, algorithm=MD5, nonce=1, nonce=2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test1438+1 -1

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

tests/data/test1439+1 -1

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

tests/data/test1443+1 -1

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

tests/data/test1448+1 -1

@@ -57,7 +57,7 @@ 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 crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: xn--4cab6c.se:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1457+1 -1

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

tests/data/test1458+1 -1

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

tests/data/test1466+1 -1

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

tests/data/test1467+1 -1

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

tests/data/test1468+1 -1

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

tests/data/test1470+1 -1

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

tests/data/test1473+9 -9

@@ -10,14 +10,14 @@ header line folding
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Content-Length: 6
+
	-foo-
	</data>
	</reply>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1475+1 -1

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

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

tests/data/test1476+2 -2

@@ -10,7 +10,7 @@ cookies
	# Server-side
	<reply>

-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Content-Length: 0
@@ -40,7 +40,7 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://curl.co.UK/ HTTP/1.1
	Host: curl.co.UK
	User-Agent: curl/%VERSION

tests/data/test1479+9 -9

@@ -9,16 +9,16 @@ HTTP/0.9
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Content-Length: 5
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Content-Length: 5
+
	Data
	</data>
-	<data2>
-	Data
-	Data
-	Data
+	<data2 crlf="yes">
+	Data
+	Data
+	Data
	</data2>
	<datacheck>
	</datacheck>
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1480+8 -8

@@ -8,13 +8,13 @@ HTTP
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 100 Continue
-	Foo: Bar
-
-	Data
-	Data
-	Data
+	<data crlf="headers">
+	HTTP/1.1 100 Continue
+	Foo: Bar
+
+	Data
+	Data
+	Data
	</data>
	<datacheck>
	</datacheck>
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1481+1 -1

@@ -42,7 +42,7 @@ 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 crlf="yes">
+	<protocol crlf="headers">
	GET http://moo/ HTTP/1.1
	Host: moo
	User-Agent: curl/%VERSION

tests/data/test1482+9 -9

@@ -60,21 +60,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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!
-	Server: fakeit/0.9 fakeitbad/1.0
-	Transfer-Encoding: chunked, chunked
-	Connection: mooo
-
-	chunky-trailer: header data
-	another-header: yes
+	<file name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 funky chunky!
+	Server: fakeit/0.9 fakeitbad/1.0
+	Transfer-Encoding: chunked, chunked
+	Connection: mooo
+
+	chunky-trailer: header data
+	another-header: yes
	</file>
	</verify>

tests/data/test1483+10 -10

@@ -62,22 +62,22 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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!
-	Server: fakeit/0.9 fakeitbad/1.0
-	Transfer-Encoding: chunked
-	Transfer-Encoding: chunked
-	Connection: mooo
-
-	chunky-trailer: header data
-	another-header: yes
+	<file name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 funky chunky!
+	Server: fakeit/0.9 fakeitbad/1.0
+	Transfer-Encoding: chunked
+	Transfer-Encoding: chunked
+	Connection: mooo
+
+	chunky-trailer: header data
+	another-header: yes
	</file>
	</verify>

tests/data/test1484+11 -11

@@ -9,19 +9,19 @@ HTTP HEAD
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Transfer-Encoding: chunked
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Transfer-Encoding: chunked
+
	HEAD response with content
	</data>
	# make sure no data is written
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Transfer-Encoding: chunked
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Transfer-Encoding: chunked
+
	</datacheck>
	</reply>

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

tests/data/test1485+11 -11

@@ -8,18 +8,18 @@ HTTP GET

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Server: Someone
-	Content-Length: 7
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Someone
+	Content-Length: 7
+
	123456
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Server: Someone
-	Content-Length: 7
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Someone
+	Content-Length: 7
+
	123456
	</datacheck>
	</reply>
@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

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

tests/data/test1487+1 -1

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

tests/data/test1489+3 -3

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -42,14 +42,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D % -s
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<stderr crlf="yes">
+	<stderr crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1492+1 -1

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

tests/data/test1493+9 -9

@@ -57,21 +57,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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!
-	Server: fakeit/0.9 fakeitbad/1.0
-	Transfer-Encoding: identity, chunked
-	Connection: mooo
-
-	chunky-trailer: header data
-	another-header: yes
+	<file name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 funky chunky!
+	Server: fakeit/0.9 fakeitbad/1.0
+	Transfer-Encoding: identity, chunked
+	Connection: mooo
+
+	chunky-trailer: header data
+	another-header: yes
	</file>
	</verify>

tests/data/test1494+2 -2

@@ -10,7 +10,7 @@ DELAY
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 funky chunky!
	Server: fakeit/0.9 fakeitbad/1.0
	Transfer-Encoding: identity, identity
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1495+2 -2

@@ -10,7 +10,7 @@ DELAY
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 funky chunky!
	Server: fakeit/0.9 fakeitbad/1.0
	Transfer-Encoding: chunked, identity
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1496+2 -2

@@ -10,7 +10,7 @@ DELAY
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 funky chunky!
	Server: fakeit/0.9 fakeitbad/1.0
	Transfer-Encoding: gzip, chunked
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1497+1 -1

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

tests/data/test1498+5 -5

@@ -10,11 +10,11 @@ chunked Transfer-Encoding

	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+
	blablabla

	</data>

tests/data/test1499+1 -1

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

tests/data/test15+15 -15

@@ -8,13 +8,13 @@ HTTP GET
	</info>
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Fake: yes
-	Fake: yes
-	Fake: yes
-	Content-Length: 26
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Fake: yes
+	Fake: yes
+	Fake: yes
+	Content-Length: 26
+
	Repeated nonsense-headers
	</data>
	</reply>
@@ -34,17 +34,17 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER --write-out "%{url_effective} %{http_c

	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/1.1 200 OK
-	Fake: yes
-	Fake: yes
-	Fake: yes
-	Content-Length: 26
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 OK
+	Fake: yes
+	Fake: yes
+	Fake: yes
+	Content-Length: 26
+
	Repeated nonsense-headers
	http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER 200 26
	</stdout>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /want/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test150+26 -26

@@ -16,39 +16,39 @@ NTLM
	This is supposed to be returned when the server gets a first
	Authorization: NTLM line passed-in from the client -->

-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1002>

-	<datacheck>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

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

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

tests/data/test1500+8 -8

@@ -9,14 +9,14 @@ multi

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 all good!
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Content-Length: 12
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 all good!
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Content-Length: 12
+	Connection: close
+
	Hello World
	</data>
	</reply>

tests/data/test1502+13 -13

@@ -9,18 +9,18 @@ CURLOPT_RESOLVE
	</info>

	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -45,7 +45,7 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: google.com:%HTTPPORT
	Accept: /

tests/data/test1503+13 -13

@@ -9,18 +9,18 @@ CURLOPT_RESOLVE
	</info>

	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -45,7 +45,7 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: google.com:%HTTPPORT
	Accept: /

tests/data/test1504+13 -13

@@ -9,18 +9,18 @@ CURLOPT_RESOLVE
	</info>

	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -45,7 +45,7 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: google.com:%HTTPPORT
	Accept: /

tests/data/test1505+13 -13

@@ -9,18 +9,18 @@ CURLOPT_RESOLVE
	</info>

	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -45,7 +45,7 @@ http://google.com:%HTTPPORT/%TESTNUMBER %HTTPPORT %HOSTIP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: google.com:%HTTPPORT
	Accept: /

tests/data/test1506+5 -5

@@ -9,7 +9,7 @@ verbose logs

	# Server-side
	<reply>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -17,7 +17,7 @@ Content-Length: 47

	file contents should appear once for each file
	</data1>
-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -25,7 +25,7 @@ Content-Length: 47

	file contents should appear once for each file
	</data2>
-	<data3 crlf="yes">
+	<data3 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -33,7 +33,7 @@ Content-Length: 47

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

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

tests/data/test1509+26 -26

@@ -14,30 +14,30 @@ proxytunnel
	<servercmd>
	connection-monitor
	</servercmd>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-	Server: the beast that eats naughty clients
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Server: the beast that eats naughty clients
+
	</connect>

-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+
	</data>
-	<datacheck>
-	HTTP/1.1 200 Mighty fine indeed
-	Server: the beast that eats naughty clients
-
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+	Server: the beast that eats naughty clients
+
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+
	header length is ........: 245
	header length should be..: 245
	</datacheck>
@@ -73,11 +73,11 @@ moo

	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: the.old.moo.%TESTNUMBER:%HTTPPORT
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: the.old.moo.%TESTNUMBER:%HTTPPORT
+	Proxy-Connection: Keep-Alive
+
	[DISCONNECT]
	</proxy>
	<protocol crlf="headers">

tests/data/test151+1 -1

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

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

tests/data/test1510+25 -25

@@ -9,36 +9,36 @@ flaky

	# 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="headers">
+	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="headers">
+	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="headers">
+	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="headers">
+	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>
@@ -61,7 +61,7 @@ HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)

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

tests/data/test1511+26 -26

@@ -8,35 +8,35 @@ CURLOPT_TIMECONDITION

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fakem
-	Last-Modified: Mon, 22 Apr 2013 17:45:05 GMT
-	Content-Type: text/html
-	Content-Length: 12
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fakem
+	Last-Modified: Mon, 22 Apr 2013 17:45:05 GMT
+	Content-Type: text/html
+	Content-Length: 12
+	Connection: close
+
	Hello World
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fakem
-	Last-Modified: Mon, 22 Apr 2013 17:45:05 GMT
-	Content-Type: text/html
-	Content-Length: 12
-	Connection: close
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fakem
-	Last-Modified: Mon, 22 Apr 2013 17:45:05 GMT
-	Content-Type: text/html
-	Content-Length: 12
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fakem
+	Last-Modified: Mon, 22 Apr 2013 17:45:05 GMT
+	Content-Type: text/html
+	Content-Length: 12
+	Connection: close
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fakem
+	Last-Modified: Mon, 22 Apr 2013 17:45:05 GMT
+	Content-Type: text/html
+	Content-Length: 12
+	Connection: close
+
	Hello World
	</datacheck>

tests/data/test1512+25 -25

@@ -8,36 +8,36 @@ GLOBAL DNS CACHE

	# 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="headers">
+	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="headers">
+	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="headers">
+	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="headers">
+	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>
@@ -60,7 +60,7 @@ GLOBAL CACHE test over two easy performs

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

tests/data/test1513+3 -3

@@ -8,9 +8,9 @@ DELAY

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 204 PARTIAL
-	X-Comment: partial response to keep the client waiting
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 204 PARTIAL
+	X-Comment: partial response to keep the client waiting
	</data>
	<postcmd>
	wait 10

tests/data/test1514+6 -6

@@ -10,12 +10,12 @@ chunked Transfer-Encoding

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Sun, 19 Jan 2014 18:50:58 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Sun, 19 Jan 2014 18:50:58 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+
	</data>
	</reply>

tests/data/test1517+1 -1

@@ -62,7 +62,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<strippart>
	s/^(this is what we post to the silly web server)(\r)?\n//
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	POST /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test152+1 -1

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

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

tests/data/test1520+11 -11

@@ -19,17 +19,17 @@ lib%TESTNUMBER
	<name>
	SMTP with CRLF-dot-CRLF in data
	</name>
-	<stdin>
-	From: different
-	To: another
-
-
-	.
-	.
-
-	.
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+
+	.
+	.
+
+	.
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER

tests/data/test1525+9 -9

@@ -12,9 +12,9 @@ CURLOPT_PROXYHEADER

	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 OK
-
+	<connect crlf="headers">
+	HTTP/1.1 200 OK
+
	</connect>
	<data>
	HTTP/1.1 200 OK swsclose
@@ -58,12 +58,12 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: the.old.moo.%TESTNUMBER:%HTTPPORT
-	Proxy-Connection: Keep-Alive
-	User-Agent: Http Agent
-
+	<proxy crlf="headers">
+	CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: the.old.moo.%TESTNUMBER:%HTTPPORT
+	Proxy-Connection: Keep-Alive
+	User-Agent: Http Agent
+
	</proxy>
	<protocol crlf="headers">
	PUT /%TESTNUMBER HTTP/1.1

tests/data/test1526+27 -27

@@ -12,29 +12,29 @@ CURLOPT_PROXYHEADER

	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 OK
-	Server: present
-
+	<connect crlf="headers">
+	HTTP/1.1 200 OK
+	Server: present
+
	</connect>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Server: present
-
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Server: present
+
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+
	</datacheck>
	</reply>

@@ -60,12 +60,12 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: the.old.moo.%TESTNUMBER:%HTTPPORT
-	Proxy-Connection: Keep-Alive
-	User-Agent: Proxy Agent
-
+	<proxy crlf="headers">
+	CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: the.old.moo.%TESTNUMBER:%HTTPPORT
+	Proxy-Connection: Keep-Alive
+	User-Agent: Proxy Agent
+
	</proxy>
	<protocol crlf="headers">
	PUT /%TESTNUMBER HTTP/1.1

tests/data/test1527+28 -28

@@ -11,29 +11,29 @@ proxytunnel

	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 OK
-	We-are: good
-
+	<connect crlf="headers">
+	HTTP/1.1 200 OK
+	We-are: good
+
	</connect>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	We-are: good
-
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	We-are: good
+
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+
	</datacheck>

	</reply>
@@ -59,13 +59,13 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: the.old.moo.%TESTNUMBER:%HTTPPORT
-	Proxy-Connection: Keep-Alive
-	User-Agent: Http Agent
-	Expect: 100-continue
-
+	<proxy crlf="headers">
+	CONNECT the.old.moo.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: the.old.moo.%TESTNUMBER:%HTTPPORT
+	Proxy-Connection: Keep-Alive
+	User-Agent: Http Agent
+	Expect: 100-continue
+
	</proxy>
	<protocol crlf="headers">
	PUT /%TESTNUMBER HTTP/1.1

tests/data/test1528+20 -20

@@ -11,19 +11,19 @@ proxytunnel

	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 OK
-	We-are: good
-
+	<connect crlf="headers">
+	HTTP/1.1 200 OK
+	We-are: good
+
	</connect>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Content-Length: 5
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Content-Length: 5
+
	stop
	</data>

@@ -50,14 +50,14 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	GET http://the.old.moo:%HTTPPORT/%TESTNUMBER HTTP/1.1
-	Host: the.old.moo:%HTTPPORT
-	Accept: /
-	Proxy-Connection: Keep-Alive
-	User-Agent: Http Agent
-	Proxy-User-Agent: Http Agent2
-
+	<proxy crlf="headers">
+	GET http://the.old.moo:%HTTPPORT/%TESTNUMBER HTTP/1.1
+	Host: the.old.moo:%HTTPPORT
+	Accept: /
+	Proxy-Connection: Keep-Alive
+	User-Agent: Http Agent
+	Proxy-User-Agent: Http Agent2
+
	</proxy>
	</verify>
	</testcase>

tests/data/test1529+4 -4

@@ -9,10 +9,10 @@ HTTP proxy

	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 OK
-	We-are: good
-
+	<connect crlf="headers">
+	HTTP/1.1 200 OK
+	We-are: good
+
	</connect>

	</reply>

tests/data/test153+63 -63

@@ -10,35 +10,35 @@ HTTP Digest auth
	# Server-side
	<reply>
	# First reply back and ask for Digest auth
-	<data1>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data1 crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data1>

	# second reply back
-	<data2>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data2 crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data2>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1001>
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1001 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1001>

@@ -46,24 +46,24 @@ This IS the real page!
	# This is the second request, and this sends back a response saying that
	# the request contained stale data. We want an update. Set swsbounce to
	# bounce on to data1003 on the second request.
-	<data1002>
-	HTTP/1.1 401 Authorization re-negotiation please swsbounce
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="auth"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data1002 crlf="headers">
+	HTTP/1.1 401 Authorization re-negotiation please swsbounce
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="auth"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data1002>

	# The second request to the 1002 section will bounce this one back instead
	# thanks to the swsbounce keyword up there
-	<data1003>
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 30
-
+	<data1003 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 30
+
	This IS the second real page!
	</data1003>
	</reply>
@@ -91,7 +91,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%H
	<strip>
	^Authorization.*cnonce
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -121,36 +121,36 @@ User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<stdout>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<stdout crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Authorization re-negotiation please swsbounce
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="auth"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 30
-
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Authorization re-negotiation please swsbounce
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="auth"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 30
+
	This IS the second real page!
	</stdout>
	</verify>

tests/data/test1532+5 -5

@@ -9,10 +9,10 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.0 200 OK swsclose
-	Content-Length: 0
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.0 200 OK swsclose
+	Content-Length: 0
+
	</data>
	</reply>

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

tests/data/test1533+5 -5

@@ -12,11 +12,11 @@ CURLOPT_KEEP_SENDING_ON_ERROR
	<servercmd>
	auth_required
	</servercmd>
-	<data nocheck="yes">
-	HTTP/1.1 401 Authorization Required
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 15
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 401 Authorization Required
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 15

	Early Response
	</data>

tests/data/test1534+6 -6

@@ -10,11 +10,11 @@ CURLINFO_FILETIME
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.0 200 OK swsclose
-	Last-Modified: Thu, 01 Jan 1970 00:00:30 GMT
-	Content-Length: 0
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.0 200 OK swsclose
+	Last-Modified: Thu, 01 Jan 1970 00:00:30 GMT
+	Content-Length: 0
+
	</data>
	</reply>

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

tests/data/test1535+1 -1

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

tests/data/test1536+1 -1

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

tests/data/test1539+5 -5

@@ -10,11 +10,11 @@ chunked Transfer-Encoding

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Sun, 19 Jan 2014 18:50:58 GMT
-	Server: test-server/fake swsclose
-	Connection: close
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Sun, 19 Jan 2014 18:50:58 GMT
+	Server: test-server/fake swsclose
+	Connection: close
	</data>
	</reply>

tests/data/test154+31 -31

@@ -10,45 +10,45 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-	Connection: close
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</datacheck>

tests/data/test1540+1 -1

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

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

tests/data/test1541+1 -1

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

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

tests/data/test1542+5 -5

@@ -11,10 +11,10 @@ verbose logs

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Content-Length: 0
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Content-Length: 0
+
	</data>
	</reply>

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

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

tests/data/test1543+1 -1

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

tests/data/test1546+13 -13

@@ -9,20 +9,20 @@ Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache
-	Transfer-Encoding: chunked, gzip
-
-	0
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache
+	Transfer-Encoding: chunked, gzip
+
+	0
+
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache
	</datacheck>

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

tests/data/test1549+2 -2

@@ -9,7 +9,7 @@ cookies
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Content-Type: text/plain
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test155+42 -42

@@ -10,61 +10,61 @@ NTLM

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 NTLM Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 401 NTLM Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	moo
	</data>

	# This is supposed to be returned when the server gets a first
	# Authorization: NTLM line passed-in from the client
-	<data1001>
-	HTTP/1.1 401 Type-1 received, send back type-2
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Type-1 received, send back type-2
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Type-3 Received and all Things are fine swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Type-3 Received and all Things are fine swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1002>

-	<datacheck>
-	HTTP/1.1 401 NTLM Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 401 Type-1 received, send back type-2
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 200 Type-3 Received and all Things are fine swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 NTLM Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 401 Type-1 received, send back type-2
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 200 Type-3 Received and all Things are fine swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

tests/data/test1551+1 -1

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

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

tests/data/test1552+8 -8

@@ -10,14 +10,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>
	<datacheck>
	</datacheck>

tests/data/test1553+8 -8

@@ -10,14 +10,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>
	<datacheck>
	</datacheck>

tests/data/test1555+3 -3

@@ -8,9 +8,9 @@ DELAY

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 204 PARTIAL
-	X-Comment: partial response to keep the client waiting
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 204 PARTIAL
+	X-Comment: partial response to keep the client waiting
	</data>
	<postcmd>
	wait 10

tests/data/test1556+14 -14

@@ -9,19 +9,19 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-	Long: %repeat[100001 x A]%
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+	Long: %repeat[100001 x A]%
+
	-foo-
	</data>
	</reply>
@@ -46,7 +46,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test156+6 -6

@@ -9,12 +9,12 @@ HTTP PUT

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 No Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 No Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	PUT received fine. Thank you very much
	</data>
	</reply>

tests/data/test1561+1 -1

@@ -76,7 +76,7 @@ Cookies set over HTTP can't override secure ones
	</command>
	</client>
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0001 HTTP/1.1
	Host: www.example.com
	User-Agent: curl/%VERSION

tests/data/test1562+1 -1

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

tests/data/test1563+1 -1

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

tests/data/test1566+1 -1

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

tests/data/test1567+1 -1

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

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

tests/data/test1568+26 -26

@@ -10,39 +10,39 @@ HTTP Digest auth
	</info>

	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test157+7 -7

@@ -9,12 +9,12 @@ HTTP GET

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 No Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 No Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	GET received and served just fine. Thank you very much
	</data>
	</reply>
@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

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

tests/data/test1571+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1572+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1573+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1574+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1575+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1576+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1577+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1578+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1579+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 303 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 303 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test158+4 -4

@@ -8,10 +8,10 @@ HTTP POST

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 100 Continue swsclose
-	Silly-header: yeeeees
-
+	<data crlf="headers">
+	HTTP/1.1 100 Continue swsclose
+	Silly-header: yeeeees
+
	</data>
	</reply>

tests/data/test1580+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1581+3 -3

@@ -8,7 +8,7 @@ CURLOPT_FOLLOWLOCATION
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 301 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 301 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1582+2 -2

@@ -8,7 +8,7 @@ GSS-API

	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 401 OK
	Date: Tue, 09 Nov 2030 14:49:00 GMT
	Server: test-server/fake
@@ -42,7 +42,7 @@ https://%HOSTIP:%HTTPSPORT/
	</client>

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

tests/data/test159+17 -17

@@ -15,25 +15,25 @@ HTTP NTLM auth
	This is supposed to be returned when the server gets a first
	Authorization: NTLM line passed-in from the client -->

-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Connection: close
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Connection: close
+
	This is not the real page either!
	</data1001>

-	<datacheck>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAAAGgoEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Connection: close
+
	This is not the real page either!
	</datacheck>

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

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

tests/data/test1590+8 -8

@@ -10,14 +10,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>
	<datacheck>
	</datacheck>

tests/data/test1593+1 -1

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

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

tests/data/test1594+1 -1

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

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

tests/data/test1595+1 -1

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

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

tests/data/test1596+1 -1

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

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

tests/data/test16+9 -9

@@ -10,14 +10,14 @@ HTTP proxy Basic auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 22
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 22
+
	the content goes here
	</data>
	</reply>
@@ -40,7 +40,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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%

tests/data/test160+20 -20

@@ -9,18 +9,18 @@ DELAY

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 9
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 9
+
	surprise
	</data>
-	<data1>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	surprise2
	</data1>

@@ -44,20 +44,20 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/wantmore/%TES

	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 9
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 9
+
	surprise
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	surprise2
	</stdout>

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

tests/data/test1613+9 -9

@@ -10,15 +10,15 @@ HTTP proxy
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Sat, 29 Feb 2020 16:10:44 GMT
-	Server: Blafasel/1.1
-	Last-Modified: Sat, 29 Feb 2020 16:10:44 GMT
-	Content-Length: 0
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Sat, 29 Feb 2020 16:10:44 GMT
+	Server: Blafasel/1.1
+	Last-Modified: Sat, 29 Feb 2020 16:10:44 GMT
+	Content-Length: 0
+	Connection: close
+	Content-Type: text/html
+
	</data>
	</reply>

tests/data/test1617+21 -21

@@ -10,30 +10,30 @@ Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
-	2c
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
+	2c
	%hex[%1f%8b%08%08%79%9e%ab%41%00%03%6c%61%6c%61%6c%61%00%cb%c9%cc%4b%55%30%e4%52%c8%01%d1%46%5c]hex%
	%hex[%10%86%31%17%00]hex%
-	%hex[%02%71%60%18%00%00%00]hex%
-	0
-
+	%hex[%02%71%60%18%00%00%00]hex%
+	0
+
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gzip, chunked
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gzip, chunked
+
	line 1
	line 2
	line 3
@@ -61,7 +61,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --tr-encoding -H "Connection: this" -H "Con
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test162+1 -1

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

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

tests/data/test1630+16 -16

@@ -10,14 +10,14 @@ HTTPS proxy Basic auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 22
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 22
+
	the content goes here
	</data>
	</reply>
@@ -41,14 +41,14 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	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
-
+	<proxy crlf="headers">
+	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
+
	</proxy>
	</verify>
	</testcase>

tests/data/test1631+17 -17

@@ -11,14 +11,14 @@ flaky
	<reply>

	# This is the HTTPS proxy response
-	<connect>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 0
-
+	<connect crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 0
+
	</connect>

	# This is the FTP server response. The Life and Adventures of Robinson Crusoe
@@ -61,17 +61,17 @@ proxy
	s/((https.proxy):(\d+))/$2:12345/
	s/^(User-Agent: curl).*/$1/
	</strippart>
-	<proxy>
-	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
-	Host: ftp.site.thru.https.proxy:12345
+	<proxy crlf="headers">
+	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
+	Host: ftp.site.thru.https.proxy:12345
	User-Agent: curl
-	Proxy-Connection: Keep-Alive
-
-	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
-	Host: ftp.site.thru.https.proxy:12345
+	Proxy-Connection: Keep-Alive
+
+	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
+	Host: ftp.site.thru.https.proxy:12345
	User-Agent: curl
-	Proxy-Connection: Keep-Alive
-
+	Proxy-Connection: Keep-Alive
+
	</proxy>
	<protocol crlf="yes">
	USER anonymous

tests/data/test1632+21 -21

@@ -11,14 +11,14 @@ flaky
	<reply>

	# This is the HTTPS proxy response
-	<connect>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Content-Length: 0
-
+	<connect crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Content-Length: 0
+
	</connect>

	# This is the FTP server response. The Life and Adventures of Robinson Crusoe
@@ -71,22 +71,22 @@ proxy
	s/((https.proxy):(\d+))/$2:12345/
	s/^(User-Agent: curl).*/$1/
	</strippart>
-	<proxy>
-	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
-	Host: ftp.site.thru.https.proxy:12345
+	<proxy crlf="headers">
+	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
+	Host: ftp.site.thru.https.proxy:12345
	User-Agent: curl
-	Proxy-Connection: Keep-Alive
-
-	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
-	Host: ftp.site.thru.https.proxy:12345
+	Proxy-Connection: Keep-Alive
+
+	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
+	Host: ftp.site.thru.https.proxy:12345
	User-Agent: curl
-	Proxy-Connection: Keep-Alive
-
-	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
-	Host: ftp.site.thru.https.proxy:12345
+	Proxy-Connection: Keep-Alive
+
+	CONNECT ftp.site.thru.https.proxy:12345 HTTP/1.1
+	Host: ftp.site.thru.https.proxy:12345
	User-Agent: curl
-	Proxy-Connection: Keep-Alive
-
+	Proxy-Connection: Keep-Alive
+
	</proxy>
	<protocol crlf="yes">
	USER anonymous

tests/data/test1634+1 -1

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

tests/data/test1635+1 -1

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

tests/data/test164+1 -1

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

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

tests/data/test165+8 -8

@@ -11,13 +11,13 @@ IDN
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Content-Type: text/html
+	Funny-head: yesyes
+
	</data>
	</reply>

@@ -46,7 +46,7 @@ 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 crlf="yes">
+	<protocol crlf="headers">
	GET http://www.xn--4cab6c.se/page/%TESTNUMBER HTTP/1.1
	Host: www.xn--4cab6c.se
	User-Agent: curl/%VERSION

tests/data/test167+14 -14

@@ -11,28 +11,28 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	WWW-Authenticate: Digest realm="weirdorealm", nonce="12345"
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	WWW-Authenticate: Digest realm="weirdorealm", nonce="12345"
+
	</data>

-	<data1000>
-	HTTP/1.1 200 OK swsclose
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
	Server: no
	Content-Length: 15
-
+
	Nice auth sir!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	WWW-Authenticate: Digest realm="weirdorealm", nonce="12345"
-
-	HTTP/1.1 200 OK swsclose
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	WWW-Authenticate: Digest realm="weirdorealm", nonce="12345"
+
+	HTTP/1.1 200 OK swsclose
	Server: no
	Content-Length: 15
-
+
	Nice auth sir!
	</datacheck>
	</reply>
@@ -58,7 +58,7 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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%

tests/data/test1670+1 -1

@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%header{etag} %header{nope} %header{DAT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1671+1 -1

@@ -50,7 +50,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{header_json}\n' -o %LOGDIR/%TESTNUMBE
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test168+21 -21

@@ -13,40 +13,40 @@ HTTP Digest auth
	<reply>

	# this is returned first since we get no proxy-auth
-	<data>
-	HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
-	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
+	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
+
	And you should ignore this data.
	</data>

	# then this is returned since we get no server-auth
-	<data1000>
-	HTTP/1.1 401 Authorization to the remote host as well swsbounce swsclose
-	WWW-Authenticate: Digest realm="realmweirdo", nonce="123456"
-
+	<data1000 crlf="headers">
+	HTTP/1.1 401 Authorization to the remote host as well swsbounce swsclose
+	WWW-Authenticate: Digest realm="realmweirdo", nonce="123456"
+
	you should ignore this data too
	</data1000>

-	<data1001>
-	HTTP/1.1 200 OK swsclose
+	<data1001 crlf="headers">
+	HTTP/1.1 200 OK swsclose
	Server: no
	Content-Length: 15
-
+
	Nice auth sir!
	</data1001>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
-	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
-
-	HTTP/1.1 401 Authorization to the remote host as well swsbounce swsclose
-	WWW-Authenticate: Digest realm="realmweirdo", nonce="123456"
-
-	HTTP/1.1 200 OK swsclose
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
+	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
+
+	HTTP/1.1 401 Authorization to the remote host as well swsbounce swsclose
+	WWW-Authenticate: Digest realm="realmweirdo", nonce="123456"
+
+	HTTP/1.1 200 OK swsclose
	Server: no
	Content-Length: 15
-
+
	Nice auth sir!
	</datacheck>
	</reply>
@@ -72,7 +72,7 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test169+39 -39

@@ -14,59 +14,59 @@ NTLM
	<reply>

	# this is returned first since we get no proxy-auth
-	<data>
-	HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
-	Proxy-Authenticate: NTLM
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
+	Proxy-Authenticate: NTLM
+
	And you should ignore this data.
	</data>

	# then this is returned since we get no server-auth
-	<data1000>
-	HTTP/1.1 200 Authorizated fine
-	Content-Length: 27
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 Authorizated fine
+	Content-Length: 27
+
	Welcome to the end station
	</data1000>

-	<data1001>
-	HTTP/1.1 407 NTLM type-1 received sending back type-2
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 407 NTLM type-1 received sending back type-2
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 401 You now need to authenticate with the host
-	Server: Microsoft-IIS/5.0
-	WWW-Authenticate: Digest realm="r e a l m", nonce="abcdef"
-	Content-Length: 46
-	Content-Type: text/html; charset=iso-8859-1
-
+	<data1002 crlf="headers">
+	HTTP/1.1 401 You now need to authenticate with the host
+	Server: Microsoft-IIS/5.0
+	WWW-Authenticate: Digest realm="r e a l m", nonce="abcdef"
+	Content-Length: 46
+	Content-Type: text/html; charset=iso-8859-1
+
	We have not authenticated with the server yet
	</data1002>

-	<datacheck>
-	HTTP/1.1 407 NTLM type-1 received sending back type-2
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 401 You now need to authenticate with the host
-	Server: Microsoft-IIS/5.0
-	WWW-Authenticate: Digest realm="r e a l m", nonce="abcdef"
-	Content-Length: 46
-	Content-Type: text/html; charset=iso-8859-1
-
-	HTTP/1.1 200 Authorizated fine
-	Content-Length: 27
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 NTLM type-1 received sending back type-2
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 401 You now need to authenticate with the host
+	Server: Microsoft-IIS/5.0
+	WWW-Authenticate: Digest realm="r e a l m", nonce="abcdef"
+	Content-Length: 46
+	Content-Type: text/html; charset=iso-8859-1
+
+	HTTP/1.1 200 Authorizated fine
+	Content-Length: 27
+
	Welcome to the end station
	</datacheck>
	</reply>
@@ -93,7 +93,7 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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=

tests/data/test170+1 -1

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

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	POST http://a.galaxy.far.far.away/%TESTNUMBER HTTP/1.1
	Host: a.galaxy.far.far.away
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

tests/data/test1700+41 -41

@@ -10,27 +10,27 @@ HTTP/2
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
-	<data1>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	-maa-
	</data1>
	</reply>
@@ -59,7 +59,7 @@ http://%HOSTIP:%HTTP2PORT/%TESTNUMBER --http2 http://%HOSTIP:%HTTP2PORT/%TESTNUM
	^X-Forwarded-Proto:.*
	^Via:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTP2PORT
	User-Agent: curl/%VERSION
@@ -71,28 +71,28 @@ User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<stdout>
-	HTTP/1.1 101 Switching Protocols
-	Connection: Upgrade
-	Upgrade: h2c
-
-	HTTP/2 200
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	last-modified: Tue, 13 Jun 2000 12:10:00 GMT
-	etag: "21025-dc7-39462498"
-	accept-ranges: bytes
-	content-length: 6
-	content-type: text/html
-	funny-head: yesyes
-	via: 1.1 nghttpx
-
+	<stdout crlf="headers">
+	HTTP/1.1 101 Switching Protocols
+	Connection: Upgrade
+	Upgrade: h2c
+
+	HTTP/2 200%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	last-modified: Tue, 13 Jun 2000 12:10:00 GMT
+	etag: "21025-dc7-39462498"
+	accept-ranges: bytes
+	content-length: 6
+	content-type: text/html
+	funny-head: yesyes
+	via: 1.1 nghttpx
+
	-foo-
-	HTTP/2 200
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	content-length: 6
-	content-type: text/html
-	via: 1.1 nghttpx
-
+	HTTP/2 200%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	content-length: 6
+	content-type: text/html
+	via: 1.1 nghttpx
+
	-maa-
	</stdout>
	<stripfile>

tests/data/test1701+27 -27

@@ -10,18 +10,18 @@ HTTP/2
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -60,21 +60,21 @@ Content-Type: application/x-www-form-urlencoded

	datatosend
	</protocol>
-	<stdout>
-	HTTP/1.1 101 Switching Protocols
-	Connection: Upgrade
-	Upgrade: h2c
-
-	HTTP/2 200
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	last-modified: Tue, 13 Jun 2000 12:10:00 GMT
-	etag: "21025-dc7-39462498"
-	accept-ranges: bytes
-	content-length: 6
-	content-type: text/html
-	funny-head: yesyes
-	via: 1.1 nghttpx
-
+	<stdout crlf="headers">
+	HTTP/1.1 101 Switching Protocols
+	Connection: Upgrade
+	Upgrade: h2c
+
+	HTTP/2 200%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	last-modified: Tue, 13 Jun 2000 12:10:00 GMT
+	etag: "21025-dc7-39462498"
+	accept-ranges: bytes
+	content-length: 6
+	content-type: text/html
+	funny-head: yesyes
+	via: 1.1 nghttpx
+
	-foo-
	</stdout>
	<stripfile>

tests/data/test1702+28 -28

@@ -10,18 +10,18 @@ HTTP/2
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	</data>
	</reply>

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

	</protocol>
-	<stdout>
-	HTTP/1.1 101 Switching Protocols
-	Connection: Upgrade
-	Upgrade: h2c
-
-	HTTP/2 200
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	last-modified: Tue, 13 Jun 2000 12:10:00 GMT
-	etag: "21025-dc7-39462498"
-	accept-ranges: bytes
-	content-length: 6
-	content-type: text/html
-	funny-head: yesyes
-	via: 1.1 nghttpx
-
+	<stdout crlf="headers">
+	HTTP/1.1 101 Switching Protocols
+	Connection: Upgrade
+	Upgrade: h2c
+
+	HTTP/2 200%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	last-modified: Tue, 13 Jun 2000 12:10:00 GMT
+	etag: "21025-dc7-39462498"
+	accept-ranges: bytes
+	content-length: 6
+	content-type: text/html
+	funny-head: yesyes
+	via: 1.1 nghttpx
+
	</stdout>
	<stripfile>
	s/^server: nghttpx.*\r?\n//

tests/data/test1704+8 -8

@@ -10,15 +10,15 @@ HTTP/2
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/2 101 OK
+	<data crlf="headers" nocheck="yes">
+	HTTP/2 101 OK

	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	-maa-
	</data>
	</reply>
@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --http2
	^X-Forwarded-Proto:.*
	^Via:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test171+9 -9

@@ -10,14 +10,14 @@ cookies

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 25 Sep 2001 19:37:44 GMT
-	Content-Type: text/html
-	Set-Cookie: XToken=xt;Domain=.z.x.com;Path=/
-	Cache-control: private
-	Content-Length: 62
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 25 Sep 2001 19:37:44 GMT
+	Content-Type: text/html
+	Set-Cookie: XToken=xt;Domain=.z.x.com;Path=/
+	Cache-control: private
+	Content-Length: 62
+
	This server reply is for testing a simple cookie test case...
	</data>
	</reply>
@@ -41,7 +41,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://z.x.com/%TESTNUMBER HTTP/1.1
	Host: z.x.com
	User-Agent: curl/%VERSION

tests/data/test1711+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	Send >64K over SMTP
	</name>
-	<file name="%LOGDIR/email%TESTNUMBER">
-	From: different
-	To: another
-
-	%repeat[5000 x test in body... ]%
+	<file name="%LOGDIR/email%TESTNUMBER" crlf="yes">
+	From: different
+	To: another
+
+	%repeat[5000 x test in body... ]%
	</file>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -T %LOGDIR/email%TESTNUMBER

tests/data/test172+6 -6

@@ -9,11 +9,11 @@ cookies

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Content-Length: 4
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Content-Length: 4
+	Connection: close
+
	boo
	</data>
	</reply>
@@ -45,7 +45,7 @@ cookies

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

tests/data/test174+7 -7

@@ -8,13 +8,13 @@ HTTP POST

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 foobar swsclose
-	Server: Microsoft-IIS/6.0
-	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 200 foobar swsclose
+	Server: Microsoft-IIS/6.0
+	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>
	</reply>

tests/data/test175+23 -23

@@ -9,35 +9,35 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 foobar swsclose swsbounce
-	Server: Microsoft-IIS/6.0
-	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
-	Content-Type: text/html; charset=iso-8859-1
-
+	<data crlf="headers">
+	HTTP/1.1 200 foobar swsclose swsbounce
+	Server: Microsoft-IIS/6.0
+	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
+	Content-Type: text/html; charset=iso-8859-1
+
	This is not the real page
	</data>

-	<data1>
-	HTTP/1.1 200 moo swsclose
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 16
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 moo swsclose
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 16
+
	content for you
	</data1>

-	<datacheck>
-	HTTP/1.1 200 foobar swsclose swsbounce
-	Server: Microsoft-IIS/6.0
-	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
-	Content-Type: text/html; charset=iso-8859-1
-
-	HTTP/1.1 200 moo swsclose
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 16
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 foobar swsclose swsbounce
+	Server: Microsoft-IIS/6.0
+	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
+	Content-Type: text/html; charset=iso-8859-1
+
+	HTTP/1.1 200 moo swsclose
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 16
+
	content for you
	</datacheck>

tests/data/test176+23 -23

@@ -10,35 +10,35 @@ HTTP NTLM auth
	# Server-side
	<reply>
	# the first request has NTLM type-1 included, and then the 1001 is returned
-	<data1001>
-	HTTP/1.1 200 foobar swsclose
-	Server: Microsoft-IIS/6.0
-	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
-	Content-Type: text/html; charset=iso-8859-1
-
+	<data1001 crlf="headers">
+	HTTP/1.1 200 foobar swsclose
+	Server: Microsoft-IIS/6.0
+	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
+	Content-Type: text/html; charset=iso-8859-1
+
	</data1001>

	# the second request should be auth-less and then this is returned.
-	<data>
-	HTTP/1.1 200 moo swsclose
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 16
-
+	<data crlf="headers">
+	HTTP/1.1 200 moo swsclose
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 16
+
	content for you
	</data>

-	<datacheck>
-	HTTP/1.1 200 foobar swsclose
-	Server: Microsoft-IIS/6.0
-	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
-	Content-Type: text/html; charset=iso-8859-1
-
-	HTTP/1.1 200 moo swsclose
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 16
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 foobar swsclose
+	Server: Microsoft-IIS/6.0
+	Authentication-Info: Passport1.4 tname=MSPAuth,tname=MSPProf,tname=MSPConsent,tname=MSPSecAuth
+	Content-Type: text/html; charset=iso-8859-1
+
+	HTTP/1.1 200 moo swsclose
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 16
+
	content for you
	</datacheck>

tests/data/test177+7 -7

@@ -10,12 +10,12 @@ followlocation

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 MOVED swsclose swsbounce
-	Server: Microsoft-IIS/6.0
-	Location: /mooooo/%TESTNUMBER
-	Content-Type: text/html; charset=iso-8859-1
-
+	<data crlf="headers">
+	HTTP/1.1 302 MOVED swsclose swsbounce
+	Server: Microsoft-IIS/6.0
+	Location: /mooooo/%TESTNUMBER
+	Content-Type: text/html; charset=iso-8859-1
+
	</data>
	</reply>

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

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

tests/data/test178+1 -1

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

tests/data/test179+1 -1

@@ -46,7 +46,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://supertrooper.fake/c/%TESTNUMBER HTTP/1.1
	Host: supertrooper.fake
	User-Agent: curl/%VERSION

tests/data/test18+29 -29

@@ -9,25 +9,25 @@ globbing
	</info>
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 4
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 4
+
	moo
	</data>
-	<data2>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 4
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 4
+
	foo
	</data2>
-	<data3>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 4
-
+	<data3 crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 4
+
	hoo
	</data3>
	</reply>
@@ -47,7 +47,7 @@ multiple requests using {} in URL

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

	</protocol>
-	<stdout>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 4
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 4
+
	moo
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 4
-
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 4
+
	foo
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 4
-
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 4
+
	hoo
	</stdout>
	</verify>

tests/data/test1800+1 -1

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

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

tests/data/test1801+1 -1

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

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

tests/data/test1802+3 -3

@@ -7,7 +7,7 @@ HTTP CONNECT
	</info>

	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Accept-Ranges: bytes
@@ -17,7 +17,7 @@ Content-Type: text/html

	-foo-
	</data>
-	<connect crlf="yes">
+	<connect crlf="headers">
	HTTP/1.1 200 fine
	Connection: close
	Content-Length: 0
@@ -47,7 +47,7 @@ http://hello/wanted/page -p -x %HOSTIP:%HTTPPORT --header "User-Agent: myapp/1.0
	# Verify data after the test has been "shot"
	<verify>

-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT hello:80 HTTP/1.1
	Proxy-Connection: Keep-Alive
	User-Agent: Benjamin/2

tests/data/test183+6 -6

@@ -10,11 +10,11 @@ persistent connection

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 4
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 4
+
	moo
	</data>
	</reply>
@@ -37,7 +37,7 @@ proxy

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

tests/data/test184+20 -20

@@ -10,31 +10,31 @@ followlocation

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 OK swsbounce
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 4
+	<data crlf="headers">
+	HTTP/1.1 301 OK swsbounce
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 4
	Location: http://yet.another.host/%TESTNUMBER
-
+
	moo
	</data>
-	<data1>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 4
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 4
+
	moo
	</data1>
-	<datacheck>
-	HTTP/1.1 301 OK swsbounce
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 4
+	<datacheck crlf="headers">
+	HTTP/1.1 301 OK swsbounce
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 4
	Location: http://yet.another.host/%TESTNUMBER
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 4
-
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 4
+
	moo
	</datacheck>
	</reply>
@@ -57,7 +57,7 @@ proxy

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

tests/data/test185+22 -22

@@ -10,31 +10,31 @@ followlocation

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 OK swsbounce
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 4
-	Location: go/west/%TESTNUMBER
-
+	<data crlf="headers">
+	HTTP/1.1 301 OK swsbounce
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 4
+	Location: go/west/%TESTNUMBER
+
	moo
	</data>
-	<data1>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 4
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 4
+
	moo
	</data1>
-	<datacheck>
-	HTTP/1.1 301 OK swsbounce
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 4
-	Location: go/west/%TESTNUMBER
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 4
-
+	<datacheck crlf="headers">
+	HTTP/1.1 301 OK swsbounce
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 4
+	Location: go/west/%TESTNUMBER
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 4
+
	moo
	</datacheck>
	</reply>
@@ -57,7 +57,7 @@ proxy

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

tests/data/test187+1 -1

@@ -60,7 +60,7 @@ http://%HOSTIP:%HTTPPORT?oh=what-weird=test/%TESTNUMBER -L

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

tests/data/test188+1 -1

@@ -57,7 +57,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L

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

tests/data/test189+1 -1

@@ -51,7 +51,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 50 -L

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

tests/data/test1901+1 -1

@@ -9,7 +9,7 @@ CURLOPT_READFUNCTION

	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Content-Length: 6
	Content-Type: text/html

tests/data/test1903+1 -1

@@ -9,7 +9,7 @@ CURLOPT_COOKIEFILE

	# Server-side
	<reply>
-	<data nocheck="yes" crlf="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test1904+10 -10

@@ -22,9 +22,9 @@ Content-Length: 9

	contents
	</data>
-	<connect>
-	HTTP/1.1 204 Sure go ahead
-
+	<connect crlf="headers">
+	HTTP/1.1 204 Sure go ahead
+
	</connect>
	<datacheck>
	HTTP/1.1 204 Sure go ahead
@@ -61,14 +61,14 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: test.%TESTNUMBER:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1905+1 -1

@@ -42,7 +42,7 @@ cookies

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

tests/data/test1906+1 -1

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

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

tests/data/test1907+1 -1

@@ -37,7 +37,7 @@ lib%TESTNUMBER

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

tests/data/test1908+1 -1

@@ -57,7 +57,7 @@ lib%TESTNUMBER

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

tests/data/test1909+1 -1

@@ -43,7 +43,7 @@ HTTP GET --retry-all-errors to overcome partial transfer
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test1910+1 -1

@@ -49,7 +49,7 @@ lib%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[user%0aname:pass%0aword]b64%

tests/data/test1919+1 -1

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

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

tests/data/test192+1 -1

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

tests/data/test193+1 -1

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

tests/data/test1933+1 -1

@@ -59,7 +59,7 @@ http://xxx:[email protected]:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%H
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1934+1 -1

@@ -59,7 +59,7 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1935+1 -1

@@ -59,7 +59,7 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1936+1 -1

@@ -59,7 +59,7 @@ http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test194+25 -25

@@ -10,33 +10,33 @@ Resume

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 416 Requested Range Not Satisfiable swsclose
-	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
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 416 Requested Range Not Satisfiable swsclose
+	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
+	Connection: close
+
	bad
	</data>

-	<datacheck>
-	HTTP/1.1 416 Requested Range Not Satisfiable swsclose
-	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
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 416 Requested Range Not Satisfiable swsclose
+	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
+	Connection: close
+
	</datacheck>

	</reply>
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87 --fail

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

tests/data/test1941+10 -10

@@ -20,11 +20,11 @@ Set-Cookie: cookie3=data3;
	Location: /%TESTNUMBER0002

	</data>
-	<connect>
-	HTTP/1.1 200 Sure go ahead
-	Server: from the connect
-	Silly-thing: yes yes
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Sure go ahead
+	Server: from the connect
+	Silly-thing: yes yes
+
	</connect>
	</reply>

@@ -54,11 +54,11 @@ http://hello:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT

	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT hello:%HTTPPORT HTTP/1.1
-	Host: hello:%HTTPPORT
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT hello:%HTTPPORT HTTP/1.1
+	Host: hello:%HTTPPORT
+	Proxy-Connection: Keep-Alive
+
	</proxy>
	<stdout>
	Date == Thu, 09 Nov 2010 14:49:00 GMT

tests/data/test1945+10 -10

@@ -20,11 +20,11 @@ Set-Cookie: cookie3=data3;
	Location: /%TESTNUMBER0002

	</data>
-	<connect>
-	HTTP/1.1 200 Sure go ahead
-	Server: from the connect
-	Silly-thing: yes yes
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Sure go ahead
+	Server: from the connect
+	Silly-thing: yes yes
+
	</connect>
	</reply>

@@ -54,11 +54,11 @@ http://hello:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT

	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT hello:%HTTPPORT HTTP/1.1
-	Host: hello:%HTTPPORT
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT hello:%HTTPPORT HTTP/1.1
+	Host: hello:%HTTPPORT
+	Proxy-Connection: Keep-Alive
+
	</proxy>
	<stdout>
	Server == from the connect (0/2)

tests/data/test1948+17 -17

@@ -9,26 +9,26 @@ HTTP PUT

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Thu, 01 Nov 2001 14:49:00 GMT
-	Content-Type: text/html
-	Content-Length: 6
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Thu, 01 Nov 2001 14:49:00 GMT
+	Content-Type: text/html
+	Content-Length: 6
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Thu, 01 Nov 2001 14:49:00 GMT
-	Content-Type: text/html
-	Content-Length: 6
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Thu, 01 Nov 2001 14:49:00 GMT
+	Content-Type: text/html
+	Content-Length: 6
+
	hello
-	HTTP/1.1 200 OK
-	Date: Thu, 01 Nov 2001 14:49:00 GMT
-	Content-Type: text/html
-	Content-Length: 6
-
+	HTTP/1.1 200 OK
+	Date: Thu, 01 Nov 2001 14:49:00 GMT
+	Content-Type: text/html
+	Content-Length: 6
+
	hello
	</datacheck>
	</reply>

tests/data/test1956+1 -1

@@ -59,7 +59,7 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1957+1 -1

@@ -59,7 +59,7 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1958+1 -1

@@ -59,7 +59,7 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1959+1 -1

@@ -59,7 +59,7 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1960+2 -2

@@ -9,7 +9,7 @@ CURL_SOCKOPT_ALREADY_CONNECTED

	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/file %HOSTIP %HTTPPORT

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

tests/data/test1964+1 -1

@@ -58,7 +58,7 @@ http://xxx:[email protected]:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%H
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test197+1 -1

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

tests/data/test1970+1 -1

@@ -59,7 +59,7 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1974+1 -1

@@ -59,7 +59,7 @@ http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPP
	^Content-Type:.*
	^Accept:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test1976+1 -1

@@ -47,7 +47,7 @@ HTTP AWS_SIGV4 canonical request header sorting test
	# Strip the actual signature. We only care about header order in this test
	s/Signature=[a-f0-9]{64}/Signature=stripped/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	PUT /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: AWS4-HMAC-SHA256 Credential=xxx/19700101/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date;x-amz-meta-test;x-amz-meta-test-two, Signature=stripped

tests/data/test1977+1 -1

@@ -44,7 +44,7 @@ effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER?foo
	effective URL: http://%HOSTIP:%HTTPPORT/%TESTNUMBER?foo&bar
	</stdout>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test198+1 -1

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

tests/data/test1981+2 -2

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out='Time: %time{%d/%b/%Y %H:%M:%S.
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test199+1 -1

@@ -42,7 +42,7 @@ HTTP with -d, -G and {}
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test2+2 -2

@@ -9,7 +9,7 @@ HTTP Basic auth
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake swsclose
@@ -36,7 +36,7 @@ HTTP GET with user and password
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[fake:user]b64%

tests/data/test2001+12 -12

@@ -13,18 +13,18 @@ multiprotocol
	#
	# Server-side
	<reply>
-	<data1 nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data1 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data1>
	<data2 nocheck="yes">

tests/data/test2002+12 -12

@@ -15,18 +15,18 @@ multiprotocol
	#
	# Server-side
	<reply>
-	<data1 nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data1 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data1>
	<data2 nocheck="yes">

tests/data/test2003+12 -12

@@ -15,18 +15,18 @@ multiprotocol
	#
	# Server-side
	<reply>
-	<data1 nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data1 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data1>
	<data2 nocheck="yes">

tests/data/test2005+1 -1

@@ -43,7 +43,7 @@ machine example.com
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET / HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[:5up3r53cr37]b64%

tests/data/test2023+63 -63

@@ -10,91 +10,91 @@ HTTP Basic auth
	<reply>

	<!-- First request has Basic auth, wrong password -->
-	<data100>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data100>

	<!-- Second request has Basic auth, right password -->
-	<data200>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data200 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data200>

	<!-- Third request has Basic auth, wrong password -->
-	<data300>
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data300 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data300>

	<!-- Fourth request has Basic auth, wrong password -->
-	<data400>
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data400 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data400>

	<!-- Fifth request has Basic auth, right password -->
-	<data500>
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data500 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data500>

-	<datacheck>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -119,7 +119,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic basic

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0100 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[testuser:wrongpass]b64%

tests/data/test2024+69 -69

@@ -14,97 +14,97 @@ HTTP Digest auth
	ensure that the order doesn't matter. -->

	<!-- First request has Basic auth, wrong password -->
-	<data100>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data100>

	<!-- Second request has Digest auth, right password -->
-	<data1200>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1200 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1200>

	<!-- Third request has Basic auth, wrong password -->
-	<data300>
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data300 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data300>

	<!-- Fourth request has Digest auth, wrong password -->
-	<data1400>
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="3"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data1400 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="3"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data1400>

	<!-- Fifth request has Digest auth, right password -->
-	<data1500>
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1500 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1500>

-	<datacheck>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="3"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="3"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -134,7 +134,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0100 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[testuser:wrongpass]b64%

tests/data/test2025+132 -132

@@ -15,178 +15,178 @@ NTLM
	ensure that the order doesn't matter. -->

	<!-- First request has Basic auth, wrong password -->
-	<data100>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data100>

	<!-- Second request has NTLM auth, right password -->
-	<data200>
-	HTTP/1.1 401 Need Basic or NTLM auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: NTLM
-
+	<data200 crlf="headers">
+	HTTP/1.1 401 Need Basic or NTLM auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data200>

-	<data1201>
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1201 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1201>

-	<data1202>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1202 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1202>

	<!-- Third request has Basic auth, wrong password -->
-	<data300>
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data300 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data300>

	<!-- Fourth request has NTLM auth, wrong password -->
-	<data400>
-	HTTP/1.1 401 Need Basic or NTLM auth (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: NTLM
-
+	<data400 crlf="headers">
+	HTTP/1.1 401 Need Basic or NTLM auth (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data400>

-	<data1401>
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1401 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1401>

-	<data1402>
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data1402 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data1402>

	<!-- Fifth request has NTLM auth, right password -->
-	<data500>
-	HTTP/1.1 401 Need Basic or NTLM auth (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: NTLM
-
+	<data500 crlf="headers">
+	HTTP/1.1 401 Need Basic or NTLM auth (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data500>

-	<data1501>
-	HTTP/1.1 401 NTLM intermediate (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1501 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1501>

-	<data1502>
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1502 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1502>

-	<datacheck>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 401 NTLM intermediate (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 401 NTLM intermediate (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -216,7 +216,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic ntlm

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0100 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[testuser:wrongpass]b64%

tests/data/test2026+99 -99

@@ -14,133 +14,133 @@ HTTP Digest auth
	ensure that the order doesn't matter. -->

	<!-- First request has Digest auth, wrong password -->
-	<data100>
-	HTTP/1.1 401 Need Basic or Digest auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Need Basic or Digest auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is not the real page!
	</data100>

-	<data1100>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-
+	<data1100 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+
	This is a bad password page!
	</data1100>

	<!-- Second request has Basic auth, right password -->
-	<data200>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data200 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data200>

	<!-- Third request has Digest auth, wrong password -->
-	<data300>
-	HTTP/1.1 401 Need Basic or Digest auth (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="3"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data300 crlf="headers">
+	HTTP/1.1 401 Need Basic or Digest auth (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="3"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is not the real page!
	</data300>

-	<data1300>
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: Digest realm="testrealm", nonce="4"
-
+	<data1300 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: Digest realm="testrealm", nonce="4"
+
	This is a bad password page!
	</data1300>

	<!-- Fourth request has Basic auth, wrong password -->
-	<data400>
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="5"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data400 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="5"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data400>

	<!-- Fifth request has Basic auth, right password -->
-	<data500>
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data500 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data500>

-	<datacheck>
-	HTTP/1.1 401 Need Basic or Digest auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-	WWW-Authenticate: Basic realm="testrealm"
-
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Need Basic or Digest auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+	WWW-Authenticate: Basic realm="testrealm"
+
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
-	HTTP/1.1 401 Need Basic or Digest auth (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="3"
-	WWW-Authenticate: Basic realm="testrealm"
-
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: Digest realm="testrealm", nonce="4"
-
+	HTTP/1.1 401 Need Basic or Digest auth (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="3"
+	WWW-Authenticate: Basic realm="testrealm"
+
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: Digest realm="testrealm", nonce="4"
+
	This is a bad password page!
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="5"
-	WWW-Authenticate: Basic realm="testrealm"
-
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="5"
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -170,7 +170,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest basic

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

tests/data/test2027+109 -109

@@ -21,149 +21,149 @@ HTTP Digest auth
	-->

	<!-- First request has Digest auth, wrong password -->
-	<data100>
-	HTTP/1.1 401 Need Digest auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Need Digest auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+
	This is not the real page!
	</data100>

-	<data1100>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-
+	<data1100 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+
	This is a bad password page!
	</data1100>

	<!-- Second request has Digest auth, right password -->
-	<data200>
-	HTTP/1.1 401 Need Digest auth (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="3"
-
+	<data200 crlf="headers">
+	HTTP/1.1 401 Need Digest auth (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="3"
+
	This is not the real page!
	</data200>

-	<data1200>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1200 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1200>

	<!-- Third request has Digest auth, wrong password -->
-	<data300>
-	HTTP/1.1 401 Need Digest auth (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="4"
-
+	<data300 crlf="headers">
+	HTTP/1.1 401 Need Digest auth (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="4"
+
	This is not the real page!
	</data300>

-	<data1300>
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="5"
-
+	<data1300 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="5"
+
	This is a bad password page!
	</data1300>

	<!-- Fourth request has Digest auth, wrong password -->
-	<data400>
-	HTTP/1.1 401 Need Digest auth (4)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="6"
-
+	<data400 crlf="headers">
+	HTTP/1.1 401 Need Digest auth (4)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="6"
+
	This is not the real page!
	</data400>

-	<data1400>
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="7"
-
+	<data1400 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="7"
+
	This is a bad password page!
	</data1400>

	<!-- Fifth request has Digest auth, right password -->
-	<data1500>
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1500 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1500>

-	<datacheck>
-	HTTP/1.1 401 Need Digest auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Need Digest auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
-	HTTP/1.1 401 Need Digest auth (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="4"
-
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="5"
-
+	HTTP/1.1 401 Need Digest auth (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="4"
+
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="5"
+
	This is a bad password page!
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="7"
-
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="7"
-
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="7"
+
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="7"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -193,7 +193,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest digest

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

tests/data/test2028+162 -162

@@ -15,214 +15,214 @@ NTLM
	ensure that the order doesn't matter. -->

	<!-- First request has Digest auth, wrong password -->
-	<data100>
-	HTTP/1.1 401 Need Digest or NTLM auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+
	This is not the real page!
	</data100>

-	<data1100>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-	WWW-Authenticate: NTLM
-
+	<data1100 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
	</data1100>

	<!-- Second request has NTLM auth, right password -->
-	<data200>
-	HTTP/1.1 401 Need Digest or NTLM auth (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="3"
-
+	<data200 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="3"
+
	This is not the real page!
	</data200>

-	<data1201>
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1201 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1201>

-	<data1202>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1202 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1202>

	<!-- Third request has Digest auth, wrong password -->
-	<data300>
-	HTTP/1.1 401 Need Digest or NTLM auth (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="4"
-	WWW-Authenticate: NTLM
-
+	<data300 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="4"
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data300>

-	<data1300>
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="5"
-
+	<data1300 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="5"
+
	This is a bad password page!
	</data1300>

	<!-- Fourth request has NTLM auth, wrong password -->
-	<data400>
-	HTTP/1.1 401 Need Digest or NTLM auth (4)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="6"
-	WWW-Authenticate: NTLM
-
+	<data400 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth (4)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="6"
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data400>

-	<data1401>
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1401 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1401>

-	<data1402>
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="7"
-
+	<data1402 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="7"
+
	This is a bad password page!
	</data1402>

	<!-- Fifth request has NTLM auth, right password -->
-	<data500>
-	HTTP/1.1 401 Need Digest or NTLM auth (5)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="8"
-	WWW-Authenticate: NTLM
-
+	<data500 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth (5)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="8"
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data500>

-	<data1501>
-	HTTP/1.1 401 NTLM intermediate (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1501 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1501>

-	<data1502>
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1502 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1502>

-	<datacheck>
-	HTTP/1.1 401 Need Digest or NTLM auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-	WWW-Authenticate: NTLM
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
-	HTTP/1.1 401 Need Digest or NTLM auth (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="4"
-	WWW-Authenticate: NTLM
-
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="5"
-
+	HTTP/1.1 401 Need Digest or NTLM auth (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="4"
+	WWW-Authenticate: NTLM
+
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="5"
+
	This is a bad password page!
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="7"
-
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="7"
+
	This is a bad password page!
-	HTTP/1.1 401 NTLM intermediate (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 401 NTLM intermediate (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -253,7 +253,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER digest ntlm

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

tests/data/test2029+111 -111

@@ -15,151 +15,151 @@ NTLM
	ensure that the order doesn't matter. -->

	<!-- First request has NTLM auth, wrong password -->
-	<data100>
-	HTTP/1.1 401 Need Basic or NTLM auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Need Basic or NTLM auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is not the real page!
	</data100>

-	<data1101>
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1101 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1101>

-	<data1102>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: NTLM
-
+	<data1102 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
	</data1102>

	<!-- Second request has Basic auth, right password -->
-	<data200>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data200 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data200>

	<!-- Third request has NTLM auth, wrong password -->
-	<data300>
-	HTTP/1.1 401 Need Basic or NTLM auth (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data300 crlf="headers">
+	HTTP/1.1 401 Need Basic or NTLM auth (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is not the real page!
	</data300>

-	<data1301>
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1301 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1301>

-	<data1302>
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: NTLM
-
+	<data1302 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
	</data1302>

	<!-- Fourth request has Basic auth, wrong password -->
-	<data400>
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data400 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data400>

	<!-- Fifth request has Basic auth, right password -->
-	<data500>
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data500 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data500>

-	<datacheck>
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: NTLM
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Basic realm="testrealm"
-	WWW-Authenticate: NTLM
-
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Basic realm="testrealm"
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -189,7 +189,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm basic

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0100 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

tests/data/test2030+142 -142

@@ -27,191 +27,191 @@ ensure that the order doesn't matter. -->


	<!-- First request has NTLM auth, wrong password -->
-	<data100>
-	HTTP/1.1 401 Need Digest or NTLM auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+
	This is not the real page!
	</data100>

-	<data1101>
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1101 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1101>

-	<data1102>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-	WWW-Authenticate: NTLM
-
+	<data1102 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
	</data1102>

	<!-- Second request has Digest auth, right password -->
-	<data200>
-	HTTP/1.1 401 Need Digest or NTLM auth (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="3"
-
+	<data200 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="3"
+
	This is not the real page!
	</data200>

-	<data1200>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1200 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1200>

	<!-- Third request has NTLM auth, wrong password -->
-	<data300>
-	HTTP/1.1 401 Need Digest or NTLM auth (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="4"
-	WWW-Authenticate: NTLM
-
+	<data300 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="4"
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data300>

-	<data1301>
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1301 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1301>

-	<data1302>
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="5"
-
+	<data1302 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="5"
+
	This is a bad password page!
	</data1302>

	<!-- Fourth request has Digest auth, wrong password -->
-	<data400>
-	HTTP/1.1 401 Need Digest or NTLM auth (4)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="6"
-	WWW-Authenticate: NTLM
-
+	<data400 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth (4)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="6"
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data400>

-	<data1400>
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="7"
-
+	<data1400 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="7"
+
	This is a bad password page!
	</data1400>

	<!-- Fifth request has Digest auth, right password -->
-	<data500>
-	HTTP/1.1 401 Need Digest or NTLM auth (5)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: Digest realm="testrealm", nonce="8"
-	WWW-Authenticate: NTLM
-
+	<data500 crlf="headers">
+	HTTP/1.1 401 Need Digest or NTLM auth (5)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: Digest realm="testrealm", nonce="8"
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data500>

-	<data1500>
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1500 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1500>

-	<datacheck>
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: Digest realm="testrealm", nonce="2"
-	WWW-Authenticate: NTLM
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: Digest realm="testrealm", nonce="2"
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="5"
-
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="5"
+
	This is a bad password page!
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="7"
-
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Digest realm="testrealm", nonce="7"
-
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="7"
+
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Digest realm="testrealm", nonce="7"
+
	This is a bad password page!
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -242,7 +242,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm digest

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0100 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

tests/data/test2031+163 -163

@@ -11,221 +11,221 @@ NTLM
	<reply>

	<!-- First request has NTLM auth, wrong password -->
-	<data100>
-	HTTP/1.1 401 Need NTLM auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Need NTLM auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data100>

-	<data1101>
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1101 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1101>

-	<data1102>
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-
+	<data1102 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
	</data1102>

	<!-- Second request has NTLM auth, right password -->
-	<data200>
-	HTTP/1.1 401 Need NTLM auth (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-
+	<data200 crlf="headers">
+	HTTP/1.1 401 Need NTLM auth (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data200>

-	<data1201>
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1201 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1201>

-	<data1202>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1202 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1202>

	<!-- Third request has NTLM auth, wrong password -->
-	<data300>
-	HTTP/1.1 401 Need NTLM auth (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-
+	<data300 crlf="headers">
+	HTTP/1.1 401 Need NTLM auth (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data300>

-	<data1301>
-	HTTP/1.1 401 NTLM intermediate (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1301 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1301>

-	<data1302>
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-
+	<data1302 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
	</data1302>

	<!-- Fourth request has NTLM auth, wrong password -->
-	<data400>
-	HTTP/1.1 401 Need NTLM auth (4)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-
+	<data400 crlf="headers">
+	HTTP/1.1 401 Need NTLM auth (4)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data400>

-	<data1401>
-	HTTP/1.1 401 NTLM intermediate (4)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1401 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (4)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1401>

-	<data1402>
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-
+	<data1402 crlf="headers">
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
	</data1402>

	<!-- Fifth request has NTLM auth, right password -->
-	<data500>
-	HTTP/1.1 401 Need NTLM auth (5)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-
+	<data500 crlf="headers">
+	HTTP/1.1 401 Need NTLM auth (5)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+
	This is not the real page!
	</data500>

-	<data1501>
-	HTTP/1.1 401 NTLM intermediate (5)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1501 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (5)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1501>

-	<data1502>
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1502 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1502>

-	<datacheck>
-	HTTP/1.1 401 NTLM intermediate
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 401 Sorry wrong password
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 NTLM intermediate
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 401 Sorry wrong password
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
-	HTTP/1.1 401 NTLM intermediate (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 401 Sorry wrong password (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-
+	HTTP/1.1 401 NTLM intermediate (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 401 Sorry wrong password (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
-	HTTP/1.1 401 NTLM intermediate (4)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 401 Sorry wrong password (3)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-
+	HTTP/1.1 401 NTLM intermediate (4)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 401 Sorry wrong password (3)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+
	This is a bad password page!
-	HTTP/1.1 401 NTLM intermediate (5)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
-	HTTP/1.1 200 Things are fine in server land (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	HTTP/1.1 401 NTLM intermediate (5)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
+	HTTP/1.1 200 Things are fine in server land (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -255,7 +255,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER ntlm ntlm

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0100 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

tests/data/test2032+30 -30

@@ -14,45 +14,45 @@ timing-dependent
	<reply>

	<!-- Basic auth -->
-	<data100>
-	HTTP/1.1 401 Need Basic or NTLM auth
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 29
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data100 crlf="headers">
+	HTTP/1.1 401 Need Basic or NTLM auth
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 29
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is a bad password page!
	</data100>

	<!-- NTLM auth -->
-	<data200>
-	HTTP/1.1 401 Need Basic or NTLM auth (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 27
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="testrealm"
-
+	<data200 crlf="headers">
+	HTTP/1.1 401 Need Basic or NTLM auth (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 27
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="testrealm"
+
	This is not the real page!
	</data200>

-	<data1201>
-	HTTP/1.1 401 NTLM intermediate (2)
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 33
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
-
+	<data1201 crlf="headers">
+	HTTP/1.1 401 NTLM intermediate (2)
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 33
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAACAAIADAAAACGgAEAq6U1NAWaJCIAAAAAAAAAAAAAAAA4AAAATlRMTUF1dGg=
+
	This is still not the real page!
	</data1201>

-	<data1202>
-	HTTP/1.1 200 Things are fine in server land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1202 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1202>

@@ -88,7 +88,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0100 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[testuser:testpass]b64%

tests/data/test2033+1 -1

@@ -47,7 +47,7 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test2034+1 -1

@@ -43,7 +43,7 @@ simple HTTPS GET with DER public key pinning
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test2037+1 -1

@@ -43,7 +43,7 @@ simple HTTPS GET with PEM public key pinning
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test2040+1 -1

@@ -47,7 +47,7 @@ HTTP Basic authorization, then without authorization

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0100 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[testuser:testpass]b64%

tests/data/test2041+1 -1

@@ -43,7 +43,7 @@ simple HTTPS GET with base64-sha256 public key pinning
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test2046+1 -1

@@ -57,7 +57,7 @@ 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 crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: xn--4cab6c.se:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test2047+1 -1

@@ -58,7 +58,7 @@ 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 crlf="yes">
+	<protocol crlf="headers">
	GET http://xn--4cab6c.se/%TESTNUMBER HTTP/1.1
	Host: xn--4cab6c.se
	User-Agent: curl/%VERSION

tests/data/test2049+1 -1

@@ -38,7 +38,7 @@ http://www1.example.com:8081/%TESTNUMBER --connect-to ::%HOSTIP:%HTTPPORT --next
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: www1.example.com:8081
	User-Agent: curl/%VERSION

tests/data/test2050+7 -7

@@ -61,14 +61,14 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT connect.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: connect.example.com.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT connect.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: connect.example.com.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: www.example.com.%TESTNUMBER
	User-Agent: curl/%VERSION

tests/data/test2051+1 -1

@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_connects}\n" --next --connect-to
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test2052+1 -1

@@ -39,7 +39,7 @@ http://www.example.com:%HTTPPORT/%TESTNUMBER --resolve www.example.com:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: www.example.com:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test2053+1 -1

@@ -38,7 +38,7 @@ 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 crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: 10.0.0.1:8081
	User-Agent: curl/%VERSION

tests/data/test2054+1 -1

@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --connect-to foo::bar: --connect-to :123::4
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test2055+7 -7

@@ -62,14 +62,14 @@ http://www.example.com.%TESTNUMBER/%TESTNUMBER --connect-to ::connect.example.co
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT connect.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: connect.example.com.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT connect.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: connect.example.com.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: www.example.com.%TESTNUMBER
	User-Agent: curl/%VERSION

tests/data/test2056+1 -1

@@ -51,7 +51,7 @@ CURL_STUB_GSS_CREDS="KRB5_Alice"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Negotiate %b64["KRB5_Alice":[email protected]:1:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%

tests/data/test2057+1 -1

@@ -67,7 +67,7 @@ CURL_STUB_GSS_CREDS="NTLM_Alice"

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Negotiate %b64["NTLM_Alice":[email protected]:2:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA]b64%

tests/data/test2058+35 -35

@@ -13,45 +13,45 @@ CUSTOMREQUEST

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test2059+35 -35

@@ -13,45 +13,45 @@ CUSTOMREQUEST

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144", userhash=true
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144", userhash=true
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144", userhash=true
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-256", nonce="1053604144", userhash=true
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test206+5 -5

@@ -19,11 +19,11 @@ auth_required


	# this is returned first since we get no proxy-auth
-	<connect>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
-	Content-Length: 33
-
+	<connect crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
+	Content-Length: 33
+
	And you should ignore this data.
	</connect>

tests/data/test2060+35 -35

@@ -13,45 +13,45 @@ CUSTOMREQUEST

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-512-256", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-512-256", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-512-256", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", algorithm="SHA-512-256", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test2061+26 -26

@@ -8,39 +8,39 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test2062+26 -26

@@ -8,39 +8,39 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-512-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-512-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-512-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-512-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test2063+26 -26

@@ -8,39 +8,39 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-256", userhash=true
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-256", userhash=true
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-256", userhash=true
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145", algorithm="SHA-256", userhash=true
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test2064+28 -28

@@ -8,40 +8,40 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="yes">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 401 Still a bad password you moron
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-
-	This is not the real page either
+	<data1000 crlf="yes">
+	HTTP/1.1 401 Still a bad password you moron
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+
+	This is not the real page either
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Still a bad password you moron
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-
-	This is not the real page either
+	<datacheck crlf="yes">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Still a bad password you moron
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+
+	This is not the real page either
	</datacheck>

	</reply>
@@ -66,7 +66,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest

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

tests/data/test2065+28 -28

@@ -8,40 +8,40 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-512-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-512-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 401 Still a bad password you moron
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-
-	This is not the real page either
+	<data1000 crlf="yes">
+	HTTP/1.1 401 Still a bad password you moron
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+
+	This is not the real page either
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-512-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Still a bad password you moron
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-
-	This is not the real page either
+	<datacheck crlf="yes">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-512-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Still a bad password you moron
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+
+	This is not the real page either
	</datacheck>

	</reply>
@@ -66,7 +66,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest

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

tests/data/test2066+28 -28

@@ -8,40 +8,40 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-256", userhash=true
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-256", userhash=true
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 401 Still a bad password you moron
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-
-	This is not the real page either
+	<data1000 crlf="yes">
+	HTTP/1.1 401 Still a bad password you moron
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+
+	This is not the real page either
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-256", userhash=true
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Still a bad password you moron
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-
-	This is not the real page either
+	<datacheck crlf="yes">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145", algorithm="SHA-256", userhash=true
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Still a bad password you moron
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+
+	This is not the real page either
	</datacheck>

	</reply>
@@ -66,7 +66,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest

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

tests/data/test2067+25 -25

@@ -9,35 +9,35 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test2068+25 -25

@@ -9,35 +9,35 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-512-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-512-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-512-256"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-512-256"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test2069+25 -25

@@ -9,35 +9,35 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-256", userhash=true
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-256", userhash=true
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-256", userhash=true
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", algorithm="SHA-256", userhash=true
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test207+1 -1

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

tests/data/test2070+1 -1

@@ -46,7 +46,7 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test2074+1 -1

@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --oauth2-bearer mF_9.B5f-4.1JqM
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Bearer mF_9.B5f-4.1JqM

tests/data/test2076+18 -18

@@ -8,31 +8,31 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	WWW-Authenticate: Digest realm="testrealm", nonce="1"
-	Content-Length: 26
-
-	HTTP/1.1 200 OK swsclose
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	WWW-Authenticate: Digest realm="testrealm", nonce="1"
+	Content-Length: 26
+
+	HTTP/1.1 200 OK swsclose
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

@@ -58,7 +58,7 @@ HTTP with digest auth and URI contains query

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

tests/data/test2077+4 -4

@@ -9,10 +9,10 @@ GSS-API

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Content-Length: 23
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Content-Length: 23
+
	This IS the real page!
	</data>
	</reply>

tests/data/test2078+4 -4

@@ -9,10 +9,10 @@ GSS-API

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Content-Length: 23
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Content-Length: 23
+
	This IS the real page!
	</data>
	</reply>

tests/data/test2079+1 -1

@@ -47,7 +47,7 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test2081+20 -20

@@ -11,18 +11,18 @@ followlocation

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
	This server reply is for testing a simple Location: following
	</data>
-	<data2>
-	HTTP/1.1 200 This is another weirdo text message swsclose
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 This is another weirdo text message swsclose
+	Connection: close
+
	Thanks for following.
	</data2>
	</reply>
@@ -42,7 +42,7 @@ http://user:pass@%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER#anchor --location --r

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/our/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[user:pass]b64%
@@ -57,15 +57,15 @@ Accept: /
	Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER

	</protocol>
-	<stdout>
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Location: data/%TESTNUMBER0002.txt?coolsite=yes
-	Content-Length: 62
-	Connection: close
-
-	HTTP/1.1 200 This is another weirdo text message swsclose
-	Connection: close
-
+	<stdout crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Location: data/%TESTNUMBER0002.txt?coolsite=yes
+	Content-Length: 62
+	Connection: close
+
+	HTTP/1.1 200 This is another weirdo text message swsclose
+	Connection: close
+
	Thanks for following.
	http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER
	</stdout>

tests/data/test2087+1 -1

@@ -47,7 +47,7 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test2088+1 -1

@@ -42,7 +42,7 @@ HTTPS GET with client authentication (mtls)
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPS-MTLSPORT
	User-Agent: curl/%VERSION

tests/data/test2089+1 -1

@@ -42,7 +42,7 @@ HTTPS GET with client authentication (mtls) and --insecure
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPS-MTLSPORT
	User-Agent: curl/%VERSION

tests/data/test209+11 -11

@@ -14,21 +14,21 @@ NTLM
	<reply>

	# this is returned first since we get no proxy-auth
-	<connect1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 33
-
+	<connect1001 crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 33
+
	And you should ignore this data.
	</connect1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<connect1002>
-	HTTP/1.1 200 Things are fine in proxy land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-
+	<connect1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+
	</connect1002>

	# this is returned when we get a GET!
@@ -92,7 +92,7 @@ http://test.remote.example.com.%TESTNUMBER:%HTTPPORT/path/%TESTNUMBER0002 --prox

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

tests/data/test2102+2 -2

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -53,7 +53,7 @@ http://examplehost.example:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: examplehost.example:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test213+10 -10

@@ -14,21 +14,21 @@ NTLM
	<reply>

	# this is returned first since we get no proxy-auth
-	<connect1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 33
-
+	<connect1001 crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 33
+
	And you should ignore this data.
	</connect1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<connect1002>
-	HTTP/1.1 200 Things are fine in proxy land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-
+	<connect1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+
	</connect1002>

	# this is returned when we get a GET!

tests/data/test214+1 -1

@@ -40,7 +40,7 @@ MSYS2_ARG_CONV_EXCL=http://
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /{}\/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test217+7 -7

@@ -15,9 +15,9 @@ followlocation
	<reply>

	# this is returned first since we get no proxy-auth
-	<connect nocheck="yes">
-	HTTP/1.1 405 Method Not Allowed swsclose
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 405 Method Not Allowed swsclose
+
	And you should ignore this data.
	</connect>

@@ -41,7 +41,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -52,9 +52,9 @@ Proxy-Connection: Keep-Alive
	<errorcode>
	56
	</errorcode>
-	<stdout>
-	HTTP/1.1 405 Method Not Allowed swsclose
-
+	<stdout crlf="headers">
+	HTTP/1.1 405 Method Not Allowed swsclose
+
	000 405
	</stdout>
	</verify>

tests/data/test218+6 -6

@@ -9,12 +9,12 @@ chunked Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK
-	Server: test-server/fake
-	Content-Type: text/html
-	Content-Length: 6
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK
+	Server: test-server/fake
+	Content-Type: text/html
+	Content-Length: 6
+
	blaha
	</data>
	</reply>

tests/data/test22+5 -5

@@ -7,11 +7,11 @@ long URL
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 27
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 27
+
	This is the proof it works
	</data>
	</reply>

tests/data/test220+19 -19

@@ -9,28 +9,28 @@ compressed
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: GZIP
-	Content-Length: 44
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: GZIP
+	Content-Length: 44
+
	%hex[%1f%8b%08%08%79%9e%ab%41%00%03%6c%61%6c%61%6c%61%00%cb%c9%cc%4b%55%30%e4%52%c8%01%d1%46%5c%0a%10%86%31%17%00]hex%
	%hex[%02%71%60%18%00%00%00]hex%
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: GZIP
-	Content-Length: 44
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: GZIP
+	Content-Length: 44
+
	line 1
	line 2
	line 3
@@ -61,7 +61,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test221+19 -19

@@ -10,30 +10,30 @@ FAILURE
	#
	# Server-side
	<reply>
-	<data nonewline="yes">
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: gzip
-	Content-Length: 41
-
+	<data crlf="headers" nonewline="yes">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: gzip
+	Content-Length: 41
+
	%hex[%08%79%9e%ab%41%00%03%6c%61%6c%61%6c%61%00%cb%c9%cc%4b%55%30%e4%52%c8%01%d1%46%5c%0a%10%86%31%17%00]hex%
	%hex[%02%71%60%18%00%00%00]hex%
	</data>

	# I removed the first three bytes of the gzip compressed contents

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: gzip
-	Content-Length: 41
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: gzip
+	Content-Length: 41
+
	</datacheck>

	</reply>
@@ -61,7 +61,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test222+10 -10

@@ -9,15 +9,15 @@ compressed
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: deflate
-	Content-Length: 1305
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: deflate
+	Content-Length: 1305
+
	%hex[%78%9c%dc%58%db%6e%e3%36%10%7d%37%90%7f%60%fd%d4%02%b6%6e%b6%13%39%70%b4%28%72%d9%04%cd%36%c1%da%05%ba%4f%06%2d%d1%36%1b%49%14%48%ca%b9%3c%f4%db%3b%94%28%89%b1%1c%af%77%83%be%04%48%62%72%e6%9c%c3%e1%0c%49%93%99%7c%7a%4a%62%b4%21%5c%50%96%9e%75%5d%cb%e9%22%92%86%2c%a2%e9%ea%ac%7b%33%bd%eb%fb%fe%68%dc%77%bb%9f%82%ce%e4%97%8b%bb%f3%d9%b7%fb%4b%94%71%f6%0f%09%65%3f%a6%42%02%10%4d%bf%4d%67%97%5f%50%77%2d%65%76%6a%db%4b%4e%c4%3a%21%58%5a%29%91%f6%02%87%0f%24%8d%ec%65%d2%d7%3c%d1%77%ac%a1%15%c9%a8%0b%a2%5b%5a%41%07%a1%ca%a6%da%4d%6f%4e%a3%c0%3d%76%bd%89%6d%18%4a%44%84%25%99%e3%28%22%80%18%8f%fd%be%e3%f7%3d%17%39%c3%53%c7%3d%f5%c6%13%db%f0%1b%84%3c%53%1f%51%e0%39%ce%b0%ef%3a%7d%d7%47%8e%77%ea%c1%cf%40%53%2a%c4%ab%38%52%9c%90%b9%58%33%2e%83%30%e7%71%1d%8e%61%6f%e3%97%79%1c%17%70%84%d3%08%c5%74%d1%a6%16%10%1d%1e%11%a1%96%3a%67%49%52%52%52%82%24%63%b5%00%c7%fc%19%2d%19%47%61%4c%49%2a%fb%82%46%04%fd%f5%f5%16%49%8e%53%b1%84%8a%5a%30%8b%46%c8%50%de%19%0c%a2%02%e1%72%04%a5%5a%a9%70%55%df%25%8d%89%38%ea%e4%42%75%d4%18%e2%39%95%f8%c9%42%37%12%89%3c%cb%40%5f%a0%eb%d9%ec%be%57%fc%9d%f6%d0%15%b4%8f%3a%57%45%fb%e2%e6%7c%d6%43%b3%cb%db%3f%2f%e1%f3%f6%e2%77%80%5d%dd%dc%5e%f6%8a%e1%3f%df%dd%5f%5f%7e%85%36%0c%f0%48%62%88%a9%94%ea%67%4c%c8%9e%6e%e6%d0]hex%
	%hex[%19%7b%a0%44%14%da%28%cf%62%86%23%18%02%96%5a%9e%90%a8%99%75%0f%65%58%88%47%c6%23%d5%84%c8%d2%3c%59%14%f6%e9%f4%f6%a8%13%12%2e%e9%92%86%50%57%30%fd%41%38%f8%98%28%43%81%6a%3c%c1%08%c5%b4%20%1b%19%7b%24%9c%44%47%9d%c5%73%95%a4%1e%92%6b%f2%66%c6%ab%b2%58%47%9d%d9%1a%a8%08%c3%ef%82%a6%6a%33%09%48%6d%9d%6a%95%60%06%9b%0e%79%ce%51%27%c6%e9%2a%c7%2b%22%8a%18%48%ba%a1%9c%a5%09%0c%20%40%47%97%d0%58%1b%1b%2a%71%4c%e5%f3%5c%84%8c%93%60%74%e2%0f%ad%d1%c9%c4%de%b2%6f%81%33%c2%43%90%0c%06%96%7b%6c%60%2b%f3%16%1a%e6%f3%00%7b%6d%6c%20%0b%93%5e%d7%2c%cb%63%cc%9b%b1%8e%47%63%88%61%08%cb%79%db%d3%22%54%03%ba%03%cb%77%5f%11%5e%87%62%38%ca%60%9c%d1%2b%b4%11%0e%c7%c5%b9%e1%5b%23%67%62%eb%8e%e9%99%87%2c%07%5d%cf%ad%bc%da%f0]hex%
	%hex[%53%0e%e2%0f%6a%8c%31%80%c8%17%22%e4%34%93%70%44%8a%60%a0%4e%87%d7%a6%12%06%a5%4f%c3%f5%5c%ed%e5%e0%82%2c%71%1e%cb%89%6d%1a%4b%18%d4%7f%5e%1d%60%19%94%3d%d8%79%68%56%27%a5%ad%d6%8b%3d%b1%5b%ac%46%6c%cd%12%f2%b6%10%2c%60%ca%4b%15%75%78%da%26%43%eb%d6%02%8d%a6%5c%bd%1c%2e%07%60%ad%a4%68%8d%c8%e2%c5%3b%5c%04%c0%5a%44%d1%1a%91%17%9a%1d%2e%02%60%2d%a2%68%8d%48%b8%86%3d%46%62%b6%3a%5c%aa%a6%68%c1%46%a2%91%e5%59%72%b8%20%80%b5%94%a2%35%22%11%59%1c%2e%02%60%2d%a2%68%8d%08%13%4f%87%8b%00%58%8b%28%9a%51%2f%11%a9%f3%f2%07%6a%56%12%aa%ba%69%ba%b1%cc%73%0e%69%13%24%d0%eb%b7%ea%1a%85%d9%88%1f%28%c9%46%54%c5%d8%08%43%44%dd%1c%0e%57%51%68%2d%53%10%1b%9d%84%72%ce%f8%e1%4a%25%5e%6b%69%b2%59%d7%84%05%55%ad%a0%59%7a%62]hex%
@@ -172,7 +172,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test223+19 -19

@@ -12,27 +12,27 @@ FAILURE
	<reply>
	# this deflate chunk has three bytes removed from the beginning and is cut
	# short
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: deflate
-	Content-Length: 1305
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: deflate
+	Content-Length: 1305
+
	%hex[%58%db%6e%e3%36%10%7d%37%90%7f%60%fd%d4%02%b6%6e%b6%13%39%70%b4%28%72%d9%04%cd%36%c1%da%05%ba%4f%06%2d%d1%36%1b%49%14%48%ca%b9%3c%f4%db%3b%94%28%89%b1%1c%af%77%83%be%04%48%62%72%e6%9c%c3%e1%0c%49%93%99%7c%7a%4a%62%b4%21%5c%50%96%9e%75%5d%cb%e9%22%92%86%2c%a2%e9%ea%ac%7b%33%bd%eb%fb%fe%68%dc%77%bb%9f%82%ce%e4%97%8b%bb%f3%d9%b7%fb%4b%94%71%f6%0f%09%65%3f%a6%42%02%10%4d%bf%4d%67%97%5f%50%77%2d%65%76%6a%db%4b%4e%c4%3a%21%58%5a%29%91%f6%02%87%0f%24%8d%ec%65%d2%d7%3c%d1%77%ac%a1%15%c9%a8%0b%a2%5b%5a%41%07%a1%ca%a6%da%4d%6f%4e%a3%c0%3d%76%bd%89%6d%18%4a%44%84%25%99%e3%28%22%80%18%8f%fd%be%e3%f7%3d%17%39%c3%53%c7%3d%f5%c6%13%db%f0%1b%84%3c%53%1f%51%e0%39%ce%b0%ef%3a%7d%d7%47%8e%77%ea%c1%cf%40%53%2a%c4%ab%38%52%9c%90%b9%58%33%2e%83%30%e7%71%1d%8e%61%6f%e3%97%79%1c%17%70%84%d3%08%c5%74%d1%a6%16%10%1d%1e%11%a1%96%3a%67%49%52%52%52%82%24%63%b5%00%c7%fc%19%2d%19%47%61%4c%49%2a%fb%82%46%04%fd%f5%f5%16%49%8e%53%b1%84%8a%5a%30%8b%46%c8%50%de%19%0c%a2%02%e1%72%04%a5%5a%a9%70%55%df%25%8d%89%38%ea%e4%42%75%d4%18%e2%39%95%f8%c9%42%37%12%89%3c%cb%40%5f%a0%eb%d9%ec%be%57%fc%9d%f6%d0%15%b4%8f%3a%57%45%fb%e2%e6%7c%d6%43%b3%cb%db%3f%2f%e1%f3%f6%e2%77%80%5d%dd%dc%5e%f6%8a%e1%3f%df%dd%5f%5f%7e%85%36%0c%f0%48%62%88%a9%94%ea%67%4c%c8%9e%6e%e6%d0]hex%
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: deflate
-	Content-Length: 1305
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: deflate
+	Content-Length: 1305
+
	</datacheck>

	</reply>
@@ -60,7 +60,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test224+19 -19

@@ -9,27 +9,27 @@ compressed
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: gzip
-	Content-Length: 2186
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: gzip
+	Content-Length: 2186
+
	%hex[%1f%8b%08%1c%bf%bc%ab%41%02%03%30%00%74%68%69%73%20%69%73%20%61%6e%20%65%78%74%72%61%20%66%69%65%6c%64%20%74%68%61%74%20%6d%75%73%74%20%62%65%20%72%65%6d%6f%76%65%64%5f%5f%5f%5f%5f%6c%6f%6e%67%2d%66%69%6c%65%6e%61%6d%65%2dxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx%00%74%68%69%73%20%69%73%20%61%20%63%6f%6d%6d%65%6e%74%20%74%68%61%74%20%6d%75%73%74%20%62%65%20%73%6b%69%70%70%65%64%00%2b%cd%4b%ce%cf%2d%28%4a%2d%2e%4e%4d%51%48%af%ca%2c%50%48%49%2c%49%54%28%cf%2c%c9%50%c8%c9%cf%4b%87%88%65%a4%26%a6%a4%16%71%01%00%b8%50%9e%cb%2d%00%00%00]hex%
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: gzip
-	Content-Length: 2186
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: gzip
+	Content-Length: 2186
+
	uncompressed gzip data with long gzip header
	</datacheck>

@@ -58,7 +58,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test230+10 -10

@@ -9,15 +9,15 @@ compressed
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: deflate, identity, gzip
-	Content-Length: 1328
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: deflate, identity, gzip
+	Content-Length: 1328
+
	%hex[%1f%8b%08%00%fa%65%fa%59%00%03%01%19%05%e6%fa%78%9c%dc%58%db%6e%e3%36%10%7d%37%90%7f%60%fd%d4%02%b6%6e%b6%13%39%70%b4%28%72%d9%04%cd%36%c1%da%05%ba%4f%06%2d%d1%36%1b%49%14%48%ca%b9%3c%f4%db%3b%94%28%89%b1%1c%af%77%83%be%04%48%62%72%e6%9c%c3%e1%0c%49%93%99%7c%7a%4a%62%b4%21%5c%50%96%9e%75%5d%cb%e9%22%92%86%2c%a2%e9%ea%ac%7b%33%bd%eb%fb%fe%68%dc%77%bb%9f%82%ce%e4%97%8b%bb%f3%d9%b7%fb%4b%94%71%f6%0f%09%65%3f%a6%42%02%10%4d%bf%4d%67%97%5f%50%77%2d%65%76%6a%db%4b%4e%c4%3a%21%58%5a%29%91%f6%02%87%0f%24%8d%ec%65%d2%d7%3c%d1%77%ac%a1%15%c9%a8%0b%a2%5b%5a%41%07%a1%ca%a6%da%4d%6f%4e%a3%c0%3d%76%bd%89%6d%18%4a%44%84%25%99%e3%28%22%80%18%8f%fd%be%e3%f7%3d%17%39%c3%53%c7%3d%f5%c6%13%db%f0%1b%84%3c%53%1f%51%e0%39%ce%b0%ef%3a%7d%d7%47%8e%77%ea%c1%cf%40%53%2a%c4%ab%38%52%9c%90%b9%58%33%2e%83%30%e7%71%1d%8e%61%6f%e3%97%79%1c%17%70%84%d3%08%c5%74%d1%a6%16%10%1d%1e%11%a1%96%3a%67%49%52%52%52%82%24%63%b5%00%c7%fc%19%2d%19%47%61%4c%49%2a%fb%82%46%04%fd%f5%f5%16%49%8e%53%b1%84%8a%5a%30%8b%46%c8%50%de%19%0c%a2%02%e1%72%04%a5%5a%a9%70%55%df%25%8d%89%38%ea%e4%42%75%d4%18%e2%39%95%f8%c9%42%37%12%89%3c%cb%40%5f%a0%eb%d9%ec%be%57%fc%9d%f6%d0%15%b4%8f%3a%57%45%fb%e2%e6%7c%d6%43%b3%cb%db%3f%2f%e1%f3%f6%e2%77%80%5d%dd%dc%5e%f6%8a%e1%3f%df%dd%5f%5f%7e%85%36%0c%f0%48%62%88%a9%94%ea%67%4c%c8%9e%6e%e6%d0]hex%
	%hex[%19%7b%a0%44%14%da%28%cf%62%86%23%18%02%96%5a%9e%90%a8%99%75%0f%65%58%88%47%c6%23%d5%84%c8%d2%3c%59%14%f6%e9%f4%f6%a8%13%12%2e%e9%92%86%50%57%30%fd%41%38%f8%98%28%43%81%6a%3c%c1%08%c5%b4%20%1b%19%7b%24%9c%44%47%9d%c5%73%95%a4%1e%92%6b%f2%66%c6%ab%b2%58%47%9d%d9%1a%a8%08%c3%ef%82%a6%6a%33%09%48%6d%9d%6a%95%60%06%9b%0e%79%ce%51%27%c6%e9%2a%c7%2b%22%8a%18%48%ba%a1%9c%a5%09%0c%20%40%47%97%d0%58%1b%1b%2a%71%4c%e5%f3%5c%84%8c%93%60%74%e2%0f%ad%d1%c9%c4%de%b2%6f%81%33%c2%43%90%0c%06%96%7b%6c%60%2b%f3%16%1a%e6%f3%00%7b%6d%6c%20%0b%93%5e%d7%2c%cb%63%cc%9b%b1%8e%47%63%88%61%08%cb%79%db%d3%22%54%03%ba%03%cb%77%5f%11%5e%87%62%38%ca%60%9c%d1%2b%b4%11%0e%c7%c5%b9%e1%5b%23%67%62%eb%8e%e9%99%87%2c%07%5d%cf%ad%bc%da%f0]hex%
	%hex[%53%0e%e2%0f%6a%8c%31%80%c8%17%22%e4%34%93%70%44%8a%60%a0%4e%87%d7%a6%12%06%a5%4f%c3%f5%5c%ed%e5%e0%82%2c%71%1e%cb%89%6d%1a%4b%18%d4%7f%5e%1d%60%19%94%3d%d8%79%68%56%27%a5%ad%d6%8b%3d%b1%5b%ac%46%6c%cd%12%f2%b6%10%2c%60%ca%4b%15%75%78%da%26%43%eb%d6%02%8d%a6%5c%bd%1c%2e%07%60%ad%a4%68%8d%c8%e2%c5%3b%5c%04%c0%5a%44%d1%1a%91%17%9a%1d%2e%02%60%2d%a2%68%8d%48%b8%86%3d%46%62%b6%3a%5c%aa%a6%68%c1%46%a2%91%e5%59%72%b8%20%80%b5%94%a2%35%22%11%59%1c%2e%02%60%2d%a2%68%8d%08%13%4f%87%8b%00%58%8b%28%9a%51%2f%11%a9%f3%f2%07%6a%56%12%aa%ba%69%ba%b1%cc%73%0e%69%13%24%d0%eb%b7%ea%1a%85%d9%88%1f%28%c9%46%54%c5%d8%08%43%44%dd%1c%0e%57%51%68%2d%53%10%1b%9d%84%72%ce%f8%e1%4a%25%5e%6b%69%b2%59%d7%84%05%55%ad%a0%59%7a%62]hex%
@@ -172,7 +172,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test2300+8 -8

@@ -8,13 +8,13 @@ WebSockets
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 101 Switching to WebSockets swsclose
-	Server: test-server/fake
-	Upgrade: websocket
-	Connection: Upgrade
-	Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs=
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 101 Switching to WebSockets swsclose
+	Server: test-server/fake
+	Upgrade: websocket
+	Connection: Upgrade
+	Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs=
+
	</data>
	# allow upgrade
	<servercmd>
@@ -47,7 +47,7 @@ WebSockets upgrade only
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes" nocheck="yes">
+	<protocol crlf="headers" nocheck="yes">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test2301+8 -8

@@ -8,14 +8,14 @@ WebSockets
	#
	# Server-side
	<reply>
-	<data nocheck="yes" nonewline="yes">
-	HTTP/1.1 101 Switching to WebSockets
-	Server: test-server/fake
-	Upgrade: websocket
-	Connection: Upgrade
-	Something: else
-	Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs=
-
+	<data crlf="headers" nocheck="yes" nonewline="yes">
+	HTTP/1.1 101 Switching to WebSockets
+	Server: test-server/fake
+	Upgrade: websocket
+	Connection: Upgrade
+	Something: else
+	Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs=
+
	%hex[%89%00]hex%
	</data>
	# allow upgrade

tests/data/test2302+8 -8

@@ -8,14 +8,14 @@ WebSockets
	#
	# Sends a PING + a 5 byte hello TEXT
	<reply>
-	<data nocheck="yes" nonewline="yes">
-	HTTP/1.1 101 Switching to WebSockets
-	Server: test-server/fake
-	Upgrade: websocket
-	Connection: Upgrade
-	Something: else
-	Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs=
-
+	<data crlf="headers" nocheck="yes" nonewline="yes">
+	HTTP/1.1 101 Switching to WebSockets
+	Server: test-server/fake
+	Upgrade: websocket
+	Connection: Upgrade
+	Something: else
+	Sec-WebSocket-Accept: HkPsVga7+8LuxM4RGQ5p9tZHeYs=
+
	%hex[%89%00%81%05hello]hex%
	</data>
	# allow upgrade

tests/data/test2303+7 -7

@@ -7,12 +7,12 @@ WebSockets

	#
	<reply>
-	<data nocheck="yes" nonewline="yes">
-	HTTP/1.1 200 Oblivious
-	Server: test-server/fake
-	Something: else
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes" nonewline="yes">
+	HTTP/1.1 200 Oblivious
+	Server: test-server/fake
+	Something: else
+	Content-Length: 6
+
	hello
	</data>
	</reply>
@@ -43,7 +43,7 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: webbie-sox/3

tests/data/test2304+1 -1

@@ -52,7 +52,7 @@ ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	# PONG with no data and the 32 bit mask
	#
	<verify>
-	<protocol crlf="yes" nocheck="yes">
+	<protocol crlf="headers" nocheck="yes">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: websocket/%TESTNUMBER

tests/data/test2306+12 -12

@@ -9,17 +9,17 @@ HTTP GET
	# This reproduces the #11101 issue, when the second response comes back
	# with the first header being "folded"
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	<data2 nocheck="yes">
@@ -54,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test2308+12 -12

@@ -8,17 +8,17 @@ HTTP GET
	#
	# This reproduces the #13669 issue
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test2309+2 -2

@@ -8,7 +8,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -54,7 +54,7 @@ password $y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPu
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://github.com/ HTTP/1.1
	Host: github.com
	Authorization: Basic %b64[daniel:$y$j9T$WUVjiVvDbRAWafDLs6cab1$01NX.oaZKf5lw8MR2Nk9Yaxv4CqbE0IaDF.GpGxPul1]b64%

tests/data/test232+10 -10

@@ -9,15 +9,15 @@ compressed
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: deflate
-	Content-Length: 1287
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: deflate
+	Content-Length: 1287
+
	%hex[%dd%58%db%6e%e3%36%10%7d%37%90%7f%60%fd%d4%02%b6%6e%b6%13%39%70%b4%28%72%d9%04%cd%36%c1%da%05%ba%4f%06%2d%d1%36%1b%49%14%48%ca%b9%3c%f4%db%3b%94%28%89%b1%1c%af%77%83%be%04%48%62%72%e6%9c%c3%e1%0c%49%93%99%7c%7a%4a%62%b4%21%5c%50%96%9e%75%5d%cb%e9%22%92%86%2c%a2%e9%ea%ac%7b%33%bd%eb%fb%fe%68%dc%77%bb%9f%82%ce%e4%97%8b%bb%f3%d9%b7%fb%4b%94%71%f6%0f%09%65%3f%a6%42%02%10%4d%bf%4d%67%97%5f%50%77%2d%65%76%6a%db%4b%4e%c4%3a%21%58%5a%29%91%f6%02%87%0f%24%8d%ec%65%d2%d7%3c%d1%77%ac%a1%15%c9%a8%0b%a2%5b%5a%41%07%a1%ca%a6%da%4d%6f%4e%a3%c0%3d%76%bd%89%6d%18%4a%44%84%25%99%e3%28%22%80%18%8f%fd%be%e3%f7%3d%17%39%c3%53%c7%3d%f5%c6%13%db%f0%1b%84%3c%53%1f%51%e0%39%ce%b0%ef%3a%7d%d7%47%8e%77%ea%c1%cf%40%53%2a%c4%ab%38%52%9c%90%b9%58%33%2e%83%30%e7%71%1d%8e%61%6f%e3%97%79%1c%17%70%84%d3%08%c5%74%d1%a6%16%10%1d%1e%11%a1%96%3a%67%49%52%52%52%82%24%63%b5%00%c7%fc%19%2d%19%47%61%4c%49%2a%fb%82%46%04%fd%f5%f5%16%49%8e%53%b1%84%8a%5a%30%8b%46%c8%50%de%19%0c%a2%02%e1%72%04%a5%5a%a9%70%55%df%25%8d%89%38%ea%e4%42%75%d4%18%e2%39%95%f8%c9%42%37%12%89%3c%cb%40%5f%a0%eb%d9%ec%be%57%fc%9d%f6%d0%15%b4%8f%3a%57%45%fb%e2%e6%7c%d6%43%b3%cb%db%3f%2f%e1%f3%f6%e2%77%80%5d%dd%dc%5e%f6%8a%e1%3f%df%dd%5f%5f%7e%85%36%0c%f0%48%62%88%a9%94%ea%67%4c%c8%9e%6e%e6%d0]hex%
	%hex[%19%7b%a0%44%14%da%28%cf%62%86%23%18%02%96%5a%9e%90%a8%99%75%0f%65%58%88%47%c6%23%d5%84%c8%d2%3c%59%14%f6%e9%f4%f6%a8%13%12%2e%e9%92%86%50%57%30%fd%41%38%f8%98%28%43%81%6a%3c%c1%08%c5%b4%20%1b%19%7b%24%9c%44%47%9d%c5%73%95%a4%1e%92%6b%f2%66%c6%ab%b2%58%47%9d%d9%1a%a8%08%c3%ef%82%a6%6a%33%09%48%6d%9d%6a%95%60%06%9b%0e%79%ce%51%27%c6%e9%2a%c7%2b%22%8a%18%48%ba%a1%9c%a5%09%0c%20%40%47%97%d0%58%1b%1b%2a%71%4c%e5%f3%5c%84%8c%93%60%74%e2%0f%ad%d1%c9%c4%de%b2%6f%81%33%c2%43%90%0c%06%96%7b%6c%60%2b%f3%16%1a%e6%f3%00%7b%6d%6c%20%0b%93%5e%d7%2c%cb%63%cc%9b%b1%8e%47%63%88%61%08%cb%79%db%d3%22%54%03%ba%03%cb%77%5f%11%5e%87%62%38%ca%60%9c%d1%2b%b4%11%0e%c7%c5%b9%e1%5b%23%67%62%eb%8e%e9%99%87%2c%07%5d%cf%ad%bc%da%f0]hex%
	%hex[%53%0e%e2%0f%6a%8c%31%80%c8%17%22%e4%34%93%70%44%8a%60%a0%4e%87%d7%a6%12%06%a5%4f%c3%f5%5c%ed%e5%e0%82%2c%71%1e%cb%89%6d%1a%4b%18%d4%7f%5e%1d%60%19%94%3d%d8%79%68%56%27%a5%ad%d6%8b%3d%b1%5b%ac%46%6c%cd%12%f2%b6%10%2c%60%ca%4b%15%75%78%da%26%43%eb%d6%02%8d%a6%5c%bd%1c%2e%07%60%ad%a4%68%8d%c8%e2%c5%3b%5c%04%c0%5a%44%d1%1a%91%17%9a%1d%2e%02%60%2d%a2%68%8d%48%b8%86%3d%46%62%b6%3a%5c%aa%a6%68%c1%46%a2%91%e5%59%72%b8%20%80%b5%94%a2%35%22%11%59%1c%2e%02%60%2d%a2%68%8d%08%13%4f%87%8b%00%58%8b%28%9a%51%2f%11%a9%f3%f2%07%6a%56%12%aa%ba%69%ba%b1%cc%73%0e%69%13%24%d0%eb%b7%ea%1a%85%d9%88%1f%28%c9%46%54%c5%d8%08%43%44%dd%1c%0e%57%51%68%2d%53%10%1b%9d%84%72%ce%f8%e1%4a%25%5e%6b%69%b2%59%d7%84%05%55%ad%a0%59%7a%62]hex%
@@ -172,7 +172,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test233+1 -1

@@ -75,7 +75,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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%

tests/data/test234+1 -1

@@ -77,7 +77,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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%

tests/data/test239+21 -21

@@ -13,35 +13,35 @@ NTLM
	<reply>

	# this is returned first since we get no proxy-auth
-	<data1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
+	<data1001 crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
	Hey you, authenticate or go away!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</data1002>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</datacheck>
	</reply>

tests/data/test24+1 -1

@@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail --silent --show-error

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

tests/data/test240+1 -1

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

tests/data/test2400+9 -9

@@ -11,14 +11,14 @@ HTTPS
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -49,7 +49,7 @@ HTTP/2 GET over HTTPS
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout crlf="yes">
+	<stdout crlf="headers">
	HTTP/2 200%spc%
	date: Tue, 09 Nov 2010 14:49:00 GMT
	content-length: 6

tests/data/test2401+15 -15

@@ -11,13 +11,13 @@ HTTPS
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 201 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-	Content-Length: 0
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 201 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+	Content-Length: 0
+	Funny-head: yesyes
+
	</data>
	</reply>

@@ -46,14 +46,14 @@ HTTP/2 POST over HTTPS
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/2 201
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	content-length: 0
-	funny-head: yesyes
-	server: nghttpx
-	via: 1.1 nghttpx
-
+	<stdout crlf="headers">
+	HTTP/2 201%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	content-length: 0
+	funny-head: yesyes
+	server: nghttpx
+	via: 1.1 nghttpx
+
	</stdout>
	<protocol crlf="yes" nonewline="yes">
	POST /%TESTNUMBER HTTP/1.1

tests/data/test2402+25 -25

@@ -10,36 +10,36 @@ 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
-
+	<data1 crlf="headers">
+	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="headers">
+	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="headers">
+	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="headers">
+	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>
@@ -67,7 +67,7 @@ HTTP GET multiple files over HTTP/2 using HTTPS

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

tests/data/test2403+2 -2

@@ -13,7 +13,7 @@ HTTPS
	#
	# Server-side
	<reply>
-	<data nocheck="yes" crlf="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Content-Length: 6
@@ -50,7 +50,7 @@ HTTP/2 GET using %{header_json}
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout crlf="yes">
+	<stdout crlf="headers">
	HTTP/2 200%spc%
	date: Tue, 09 Nov 2010 14:49:00 GMT
	content-length: 6

tests/data/test2404+5 -5

@@ -10,7 +10,7 @@ verbose logs

	# Server-side
	<reply>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: server.example.com
@@ -18,7 +18,7 @@ Content-Length: 47

	file contents should appear once for each file
	</data1>
-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: server.example.com
@@ -26,7 +26,7 @@ Content-Length: 47

	file contents should appear once for each file
	</data2>
-	<data3 crlf="yes">
+	<data3 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: server.example.com
@@ -34,7 +34,7 @@ Content-Length: 47

	file contents should appear once for each file
	</data3>
-	<data4 crlf="yes">
+	<data4 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: server.example.com
@@ -67,7 +67,7 @@ HTTP/2 using STREAM_WEIGHTs

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

tests/data/test2406+9 -9

@@ -11,14 +11,14 @@ HTTPS
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 404 nope
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 404 nope
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -48,7 +48,7 @@ HTTP/2 over HTTPS with -f
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout crlf="yes">
+	<stdout crlf="headers">
	HTTP/2 404%spc%
	date: Tue, 09 Nov 2010 14:49:00 GMT
	content-length: 6

tests/data/test241+1 -1

@@ -43,7 +43,7 @@ HTTP-IPv6 GET (using ip6-localhost)
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: ip6-localhost:%HTTP6PORT
	User-Agent: curl/%VERSION

tests/data/test242+1 -1

@@ -40,7 +40,7 @@ HTTP-IPv6 GET with username+password in URL
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOST6IP:%HTTP6PORT
	Authorization: Basic %b64[foobar:barfoo]b64%

tests/data/test243+38 -38

@@ -13,56 +13,56 @@ NTLM
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# this is returned first since we get no proxy-auth
-	<data1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
+	<data1001 crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
	Hey you, authenticate or go away!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</data1002>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</datacheck>
	</reply>

tests/data/test245+25 -25

@@ -9,35 +9,35 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test246+35 -35

@@ -9,45 +9,45 @@ HTTP Digest auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>

-	<datacheck>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>

tests/data/test249+1 -1

@@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test25+1 -1

@@ -73,7 +73,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 5

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

tests/data/test2500+3 -3

@@ -10,7 +10,7 @@ HTTP/3
	#
	# Server-side
	<reply>
-	<data nocheck="yes" crlf="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
@@ -50,14 +50,14 @@ HTTP/3 GET:
	^X-Forwarded-Proto:.*
	^Via:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET https://localhost:%HTTP3PORT/%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTP3PORT
	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<stdout crlf="yes">
+	<stdout crlf="headers">
	HTTP/3 200%spc%
	date: Tue, 09 Nov 2010 14:49:00 GMT
	last-modified: Tue, 13 Jun 2000 12:10:00 GMT

tests/data/test2501+14 -14

@@ -11,13 +11,13 @@ HTTPS
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 201 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-	Content-Length: 0
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 201 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+	Content-Length: 0
+	Funny-head: yesyes
+
	</data>
	</reply>

@@ -46,13 +46,13 @@ HTTP/3 POST
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/3 201
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	content-length: 0
-	funny-head: yesyes
-	via: 1.1 nghttpx
-
+	<stdout crlf="headers">
+	HTTP/3 201%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	content-length: 0
+	funny-head: yesyes
+	via: 1.1 nghttpx
+
	</stdout>
	<protocol crlf="yes" nonewline="yes">
	POST https://%HOSTIP:%HTTP3PORT/2501 HTTP/1.1

tests/data/test2502+5 -5

@@ -10,7 +10,7 @@ verbose logs

	# Server-side
	<reply>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: server.example.com
@@ -18,7 +18,7 @@ Content-Length: 47

	file contents should appear once for each file
	</data1>
-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: server.example.com
@@ -26,7 +26,7 @@ Content-Length: 47

	file contents should appear once for each file
	</data2>
-	<data3 crlf="yes">
+	<data3 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: server.example.com
@@ -34,7 +34,7 @@ Content-Length: 47

	file contents should appear once for each file
	</data3>
-	<data4 crlf="yes">
+	<data4 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: server.example.com
@@ -66,7 +66,7 @@ HTTP GET multiple over HTTP/3

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET https://localhost:%HTTP3PORT/path/%TESTNUMBER0001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test2503+2 -2

@@ -12,7 +12,7 @@ HTTPS
	#
	# Server-side
	<reply>
-	<data nocheck="yes" crlf="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Content-Length: 6
@@ -49,7 +49,7 @@ HTTP/3 header-api
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout crlf="yes">
+	<stdout crlf="headers">
	HTTP/3 200%spc%
	date: Tue, 09 Nov 2010 14:49:00 GMT
	content-length: 6

tests/data/test256+1 -1

@@ -45,7 +45,7 @@ proxy
	<errorcode>
	33
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: Basic %b64[daniel:stenberg]b64%

tests/data/test257+1 -1

@@ -85,7 +85,7 @@ machine anotherone.com login user2 password passwd2

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://supersite.com/want/%TESTNUMBER HTTP/1.1
	Host: supersite.com
	Authorization: Basic %b64[user1:passwd1]b64%

tests/data/test258+6 -6

@@ -24,12 +24,12 @@ Proxy-Connection: close
	Content-Length: 0

	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>
	<datacheck>

tests/data/test259+6 -6

@@ -21,12 +21,12 @@ Proxy-Authenticate: Digest realm="many secrets", nonce="911"
	Content-Length: 0

	</data>
-	<data1000>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1000>
	<datacheck>

tests/data/test26+1 -1

@@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -o - -o -

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

tests/data/test260+1 -1

@@ -42,7 +42,7 @@ HTTP GET URL without slash but with question mark
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /?%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test262+1 -1

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

tests/data/test263+1 -1

@@ -41,7 +41,7 @@ HTTP-IPv6 GET with proxy specified using IPv6-numerical address
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://veryveryremotesite.com/%TESTNUMBER HTTP/1.1
	Host: veryveryremotesite.com
	User-Agent: curl/%VERSION

tests/data/test264+7 -7

@@ -9,12 +9,12 @@ HTTP proxy Basic auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Type: text/html
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Type: text/html
+	Content-Length: 26
+
	the content would go here
	</data>
	</reply>
@@ -37,7 +37,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
	Host: we.want.that.site.com
	Proxy-Authorization: Basic %b64[fake:user]b64%

tests/data/test265+11 -11

@@ -14,23 +14,23 @@ NTLM
	<reply>

	# this is returned first since we get no proxy-auth
-	<connect1001>
-	HTTP/1.0 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Connection: Keep-Alive
-	Content-Length: 1033
-
+	<connect1001 crlf="headers">
+	HTTP/1.0 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Connection: Keep-Alive
+	Content-Length: 1033
+
	And you should ignore this data.
	%repeat[999 x Q]%
	</connect1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<connect1002>
-	HTTP/1.1 200 Things are fine in proxy land
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-
+	<connect1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+
	</connect1002>

	# this is returned when we get a GET!

tests/data/test266+9 -9

@@ -60,21 +60,21 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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!
-	Server: fakeit/0.9 fakeitbad/1.0
-	Transfer-Encoding: chunked
-	Trailer: chunky-trailer
-	Connection: mooo
-
-	chunky-trailer: header data
+	<file name="%LOGDIR/heads%TESTNUMBER" crlf="headers">
+	HTTP/1.1 200 funky chunky!
+	Server: fakeit/0.9 fakeitbad/1.0
+	Transfer-Encoding: chunked
+	Trailer: chunky-trailer
+	Connection: mooo
+
+	chunky-trailer: header data
	</file>
	</verify>

tests/data/test267+25 -25

@@ -15,39 +15,39 @@ NTLM
	This is supposed to be returned when the server gets a first
	Authorization: NTLM line passed-in from the client -->

-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1002>

-	<datacheck>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

tests/data/test268+1 -1

@@ -9,7 +9,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test269+1 -1

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

tests/data/test27+1 -1

@@ -36,7 +36,7 @@ cookies

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

tests/data/test273+26 -26

@@ -8,39 +8,39 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test274+1 -1

@@ -34,7 +34,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L --max-redirs 0

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

tests/data/test275+12 -12

@@ -14,10 +14,10 @@ proxytunnel
	#
	# Server-side
	<reply>
-	<connect>
-	HTTP/1.1 200 OK
-	Connected-fine: sure
-
+	<connect crlf="headers">
+	HTTP/1.1 200 OK
+	Connected-fine: sure
+
	</connect>

	<data>
@@ -64,15 +64,15 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT remotesite.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: remotesite.com.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: Basic %b64[youare:yourself]b64%
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT remotesite.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: remotesite.com.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: Basic %b64[youare:yourself]b64%
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: remotesite.com.%TESTNUMBER:%HTTPPORT
	Authorization: Basic %b64[iam:myself]b64%

tests/data/test276+1 -1

@@ -59,7 +59,7 @@ HTTP Location: following with multiple question marks in URLs

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

tests/data/test278+8 -8

@@ -9,13 +9,13 @@ HTTP proxy Basic auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Type: text/html
-	Content-Length: 27
-
-	the content would go here
+	<data crlf="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Type: text/html
+	Content-Length: 27
+
+	the content would go here
	</data>
	</reply>

@@ -37,7 +37,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
	Host: we.want.that.site.com
	Proxy-Authorization: Basic %b64[fake:]b64%

tests/data/test279+8 -8

@@ -10,13 +10,13 @@ HTTP proxy Basic auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Type: text/html
-	Content-Length: 27
-
-	the content would go here
+	<data crlf="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Type: text/html
+	Content-Length: 27
+
+	the content would go here
	</data>
	</reply>

@@ -38,7 +38,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
	Host: we.want.that.site.com
	Proxy-Authorization: Basic %b64[fake:]b64%

tests/data/test28+1 -1

@@ -58,7 +58,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L

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

tests/data/test282+1 -1

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

tests/data/test287+7 -7

@@ -11,9 +11,9 @@ proxytunnel
	# Server-side
	<reply>

-	<connect nocheck="yes">
-	HTTP/1.1 405 Method Not Allowed swsclose
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 405 Method Not Allowed swsclose
+
	And you should ignore this data.
	</connect>

@@ -37,7 +37,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.remote.example.com.%TESTNUMBER:%HTTPPORT HTTP/1.1
	Host: test.remote.example.com.%TESTNUMBER:%HTTPPORT
	Proxy-Connection: Keep-Alive
@@ -48,9 +48,9 @@ User-Agent: looser/2007
	<errorcode>
	56
	</errorcode>
-	<stdout>
-	HTTP/1.1 405 Method Not Allowed swsclose
-
+	<stdout crlf="headers">
+	HTTP/1.1 405 Method Not Allowed swsclose
+
	</stdout>
	</verify>
	</testcase>

tests/data/test29+6 -6

@@ -9,11 +9,11 @@ FAILURE
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	_data_result_data_
	</data>
	<postcmd>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -m 2

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

tests/data/test292+1 -1

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

tests/data/test293+1 -1

@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2
	<errorcode>
	63
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test299+1 -1

@@ -39,7 +39,7 @@ FTP over HTTP proxy with user:pass not in url

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET ftp://michal:[email protected]/we/want/%TESTNUMBER HTTP/1.1
	Host: host.com:21
	Authorization: Basic %b64[michal:aybabtu]b64%

tests/data/test3+12 -12

@@ -9,20 +9,20 @@ HTTP Basic auth
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK
-	Server: test-server/fake
-	Content-Type: text/html
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK
+	Server: test-server/fake
+	Content-Type: text/html
+	Content-Length: 0
+
	this is data even though Content-Length is set to zero
	</data>
-	<datacheck>
-	HTTP/1.0 200 OK
-	Server: test-server/fake
-	Content-Type: text/html
-	Content-Length: 0
-
+	<datacheck crlf="headers">
+	HTTP/1.0 200 OK
+	Server: test-server/fake
+	Content-Type: text/html
+	Content-Length: 0
+
	</datacheck>
	</reply>

tests/data/test30+1 -1

@@ -27,7 +27,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER

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

tests/data/test300+1 -1

@@ -40,7 +40,7 @@ simple HTTPS GET
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test3000+1 -1

@@ -42,7 +42,7 @@ HTTPS localhost, first subaltname matches, CN does not match
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test3001+1 -1

@@ -42,7 +42,7 @@ HTTPS localhost, last subject alt name matches, CN does not match
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test3002+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP multiple and invalid (first) --mail-rcpt and --mail-rcpt-allowfails
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test3003+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP multiple and invalid (last) --mail-rcpt and --mail-rcpt-allowfails
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-rcpt invalid.five --mail-from [email protected] -T -

tests/data/test3004+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP multiple and invalid (middle) --mail-rcpt and --mail-rcpt-allowfails
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-rcpt invalid.three --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test3005+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP multiple invalid (all but one) --mail-rcpt and --mail-rcpt-allowfails
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt [email protected] --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from [email protected] -T -

tests/data/test3006+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP with multiple invalid (all) --mail-rcpt and --mail-rcpt-allowfails
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-rcpt invalid.two --mail-rcpt invalid.three --mail-rcpt invalid.four --mail-rcpt invalid.five --mail-from [email protected] -T -

tests/data/test3007+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP with invalid --mail-rcpt and --mail-rcpt-allowfails
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt-allowfails --mail-rcpt invalid.one --mail-from [email protected] -T -

tests/data/test3008+1 -1

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

tests/data/test3009+1 -1

@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/not-there
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /this/is/the/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test301+1 -1

@@ -40,7 +40,7 @@ HTTPS GET with user and password
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	Authorization: Basic %b64[fake:user]b64%

tests/data/test3011+1 -1

@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR/tm
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /this/is/the/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test3012+1 -1

@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJR --output-dir %PWD/%LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /this/is/the/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test3013+1 -1

@@ -46,7 +46,7 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR ht
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /this/is/the/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test3014+1 -1

@@ -45,7 +45,7 @@ Content-Type: text/plain
	testdata
	4
	</stdout>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /1439 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test3015+9 -9

@@ -12,14 +12,14 @@ chunked Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 302 OK
-	Date: Sun, 13 Sep 2020 15:00 GMT
-	Content-Length: 8
-	Connection: close
-	Content-Type: text/plain
-	Location: ./%TESTNUMBER0001
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 302 OK
+	Date: Sun, 13 Sep 2020 15:00 GMT
+	Content-Length: 8
+	Connection: close
+	Content-Type: text/plain
+	Location: ./%TESTNUMBER0001
+
	monster
	</data>
	<data1 nocheck="yes">
@@ -57,7 +57,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w "%{num_headers}\n" -L -o%DEV_NULL
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test302+3 -3

@@ -12,9 +12,9 @@ FAILURE
	# Server-side
	<reply>

-	<connect nocheck="yes">
-	HTTP/1.1 405 Method Not Allowed swsclose
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 405 Method Not Allowed swsclose
+
	And you should ignore this data.
	</connect>

tests/data/test3023+1 -1

@@ -46,7 +46,7 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test3024+1 -1

@@ -46,7 +46,7 @@ CURL_SSL_BACKEND=schannel
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test3028+6 -6

@@ -52,12 +52,12 @@ proxy
	s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %PROXYPORT/proxy-line/
	</strippart>

-	<proxy>
-	CONNECT %HOSTIP:%HTTPPORT HTTP/1.1
-	Host: %HOSTIP:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT %HOSTIP:%HTTPPORT HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>

	<protocol crlf="yes">

tests/data/test303+6 -6

@@ -10,11 +10,11 @@ FAILURE

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	_data_result_data_
	</data>
	<postcmd>
@@ -43,7 +43,7 @@ HTTPS with 8 secs timeout

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

tests/data/test3031+3 -3

@@ -7,7 +7,7 @@
	#
	# Server-side
	<reply>
-	<data nocheck="yes" crlf="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -43,14 +43,14 @@ http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER --dump-header %PWD/%LOGDIR/tmp/
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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">
+	<file name="%LOGDIR/tmp/out.txt" crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test3032+46 -46

@@ -9,60 +9,60 @@ HTTP
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 301 redirect swsbounce
-	Content-Length: 0
-	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
-	Part: data
-
+	<data crlf="headers">
+	HTTP/1.1 301 redirect swsbounce
+	Content-Length: 0
+	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+	Part: data
+
	</data>

-	<data1>
-	HTTP/1.1 301 redirect swsbounce
-	Content-Length: 0
-	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
-	Part: data1
-
+	<data1 crlf="headers">
+	HTTP/1.1 301 redirect swsbounce
+	Content-Length: 0
+	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+	Part: data1
+
	</data1>

-	<data2>
-	HTTP/1.1 301 redirect swsbounce
-	Content-Length: 0
-	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
-	Part: data2
-
+	<data2 crlf="headers">
+	HTTP/1.1 301 redirect swsbounce
+	Content-Length: 0
+	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+	Part: data2
+
	</data2>

-	<data3>
-	HTTP/1.1 200 OK
-	Content-Type: text/html
-	Content-Length: 30
-	Part: data3
-
+	<data3 crlf="headers">
+	HTTP/1.1 200 OK
+	Content-Type: text/html
+	Content-Length: 30
+	Part: data3
+
	XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
	</data3>

-	<datacheck>
-	HTTP/1.1 301 redirect swsbounce
-	Content-Length: 0
-	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
-	Part: data
-
-	HTTP/1.1 301 redirect swsbounce
-	Content-Length: 0
-	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
-	Part: data1
-
-	HTTP/1.1 301 redirect swsbounce
-	Content-Length: 0
-	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
-	Part: data2
-
-	HTTP/1.1 200 OK
-	Content-Type: text/html
-	Content-Length: 30
-	Part: data3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 301 redirect swsbounce
+	Content-Length: 0
+	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+	Part: data
+
+	HTTP/1.1 301 redirect swsbounce
+	Content-Length: 0
+	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+	Part: data1
+
+	HTTP/1.1 301 redirect swsbounce
+	Content-Length: 0
+	Location: http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+	Part: data2
+
+	HTTP/1.1 200 OK
+	Content-Type: text/html
+	Content-Length: 30
+	Part: data3
+
	XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
	</datacheck>

@@ -86,7 +86,7 @@ HTTP redirect loop 3x swsbounce test

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

tests/data/test3035+24 -24

@@ -15,47 +15,47 @@ retry
	#
	# the first chunk
	#
-	<data nocheck="yes" nonewline="yes">
-	HTTP/1.1 200 OK swsbounce swsclose
-	Accept-Ranges: bytes
-	Content-Type: text/html
-	Content-Length: 26
-
+	<data crlf="headers" nocheck="yes" nonewline="yes">
+	HTTP/1.1 200 OK swsbounce swsclose
+	Accept-Ranges: bytes
+	Content-Type: text/html
+	Content-Length: 26
+
	abcde
	</data>

	#
	# the second chunk
	#
-	<data1 nocheck="yes" nonewline="yes">
-	HTTP/1.1 206 Partial Content swsbounce swsclose
-	Content-Type: text/html
-	Content-Length: 21
-	Content-Range: bytes 5-25/26
-
+	<data1 crlf="headers" nocheck="yes" nonewline="yes">
+	HTTP/1.1 206 Partial Content swsbounce swsclose
+	Content-Type: text/html
+	Content-Length: 21
+	Content-Range: bytes 5-25/26
+
	fghijk
	</data1>

	#
	# some nonsense that curl should ignore as unresumable
	#
-	<data2 nocheck="yes">
-	HTTP/1.1 404 Not Found swsbounce
-	Content-Type: text/html
-	Content-Length: 5
-
+	<data2 crlf="headers" nocheck="yes">
+	HTTP/1.1 404 Not Found swsbounce
+	Content-Type: text/html
+	Content-Length: 5
+
	body
	</data2>

	#
	# some more nonsense that curl should ignore as unresumable
	#
-	<data3 nocheck="yes">
-	HTTP/1.1 200 OK swsbounce
-	Accept-Ranges: bytes
-	Content-Type: text/html
-	Content-Length: 30
-
+	<data3 crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsbounce
+	Accept-Ranges: bytes
+	Content-Type: text/html
+	Content-Length: 30
+
	XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
	</data3>

@@ -87,7 +87,7 @@ HTTP retry failed download with keep data and auto-resume

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

tests/data/test306+1 -1

@@ -52,7 +52,7 @@ HTTPS GET, receive no headers only data!
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test307+1 -1

@@ -43,7 +43,7 @@ simple HTTPS GET with openssl engine
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test309+26 -26

@@ -10,37 +10,37 @@ followlocation

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: https://%HOSTIP:%HTTPSPORT/data/%TESTNUMBER0002.txt?coolsite=yes
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: https://%HOSTIP:%HTTPSPORT/data/%TESTNUMBER0002.txt?coolsite=yes
+	Connection: close
+
	This server reply is for testing a simple Location: following to HTTPS URL

	</data>
-	<data2>
-	HTTP/1.1 200 Followed here fine swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 52
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 Followed here fine swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 52
+
	If this is received, the location following worked

	</data2>
-	<datacheck>
-	HTTP/1.1 301 This is a weirdo text message swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: https://%HOSTIP:%HTTPSPORT/data/%TESTNUMBER0002.txt?coolsite=yes
-	Connection: close
-
-	HTTP/1.1 200 Followed here fine swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 52
-
+	<datacheck crlf="headers">
+	HTTP/1.1 301 This is a weirdo text message swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: https://%HOSTIP:%HTTPSPORT/data/%TESTNUMBER0002.txt?coolsite=yes
+	Connection: close
+
+	HTTP/1.1 200 Followed here fine swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 52
+
	If this is received, the location following worked

	</datacheck>
@@ -65,7 +65,7 @@ HTTP Location: redirect to HTTPS URL

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

tests/data/test31+1 -1

@@ -99,7 +99,7 @@ local-http

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

tests/data/test310+1 -1

@@ -42,7 +42,7 @@ simple HTTPS GET
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test3100+36 -36

@@ -10,43 +10,43 @@ RTSP Basic auth

	# Server-side
	<reply>
-	<data>
-	RTSP/1.0 401 Unauthorized please swsbounce
-	Server: RTSPD/libcurl-test
-	CSeq: 1
-	WWW-Authenticate: Basic realm="please-auth-me"
-
+	<data crlf="yes">
+	RTSP/1.0 401 Unauthorized please swsbounce
+	Server: RTSPD/libcurl-test
+	CSeq: 1
+	WWW-Authenticate: Basic realm="please-auth-me"
+
	</data>
-	<data1>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	CSeq: 2
-	Content-Base: rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
-	Content-Length: 80
-	Curl-private: swsclose
-
-	v=0
-	s=rtspd SDP
-	i=A fake SDP reply
-	u=http://www.curl.example.com/fakesdp.ps
+	<data1 crlf="yes">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	CSeq: 2
+	Content-Base: rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
+	Content-Length: 80
+	Curl-private: swsclose
+
+	v=0
+	s=rtspd SDP
+	i=A fake SDP reply
+	u=http://www.curl.example.com/fakesdp.ps
	</data1>
-	<datacheck>
-	RTSP/1.0 401 Unauthorized please swsbounce
-	Server: RTSPD/libcurl-test
-	CSeq: 1
-	WWW-Authenticate: Basic realm="please-auth-me"
-
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	CSeq: 2
-	Content-Base: rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
-	Content-Length: 80
-	Curl-private: swsclose
-
-	v=0
-	s=rtspd SDP
-	i=A fake SDP reply
-	u=http://www.curl.example.com/fakesdp.ps
+	<datacheck crlf="yes">
+	RTSP/1.0 401 Unauthorized please swsbounce
+	Server: RTSPD/libcurl-test
+	CSeq: 1
+	WWW-Authenticate: Basic realm="please-auth-me"
+
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	CSeq: 2
+	Content-Base: rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
+	Content-Length: 80
+	Curl-private: swsclose
+
+	v=0
+	s=rtspd SDP
+	i=A fake SDP reply
+	u=http://www.curl.example.com/fakesdp.ps
	</datacheck>
	</reply>

@@ -69,7 +69,7 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
	CSeq: 1
	Accept: application/sdp

tests/data/test3101+30 -30

@@ -8,43 +8,43 @@ HTTP Basic auth

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsbounce
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Content-Length: 26
-	Content-Type: text/html; charset=iso-8859-1
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsbounce
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Content-Length: 26
+	Content-Type: text/html; charset=iso-8859-1
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1>
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-	Connection: close
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</data1>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsbounce
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Content-Length: 26
-	Content-Type: text/html; charset=iso-8859-1
-
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsbounce
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Content-Length: 26
+	Content-Type: text/html; charset=iso-8859-1
+
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+	Connection: close
+
	This IS the real page!
	</datacheck>
	</reply>
@@ -72,7 +72,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

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

tests/data/test3102+1 -1

@@ -38,7 +38,7 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	Accept: /

tests/data/test3103+2 -2

@@ -8,7 +8,7 @@ cookies
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://localhost/ HTTP/1.1
	Host: localhost
	Accept: /

tests/data/test3104+2 -2

@@ -8,7 +8,7 @@ cookies
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://example.com/ HTTP/1.1
	Host: example.com
	Accept: /

tests/data/test314+10 -10

@@ -9,15 +9,15 @@ compressed
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: br
-	Content-Length: 1056
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: br
+	Content-Length: 1056
+
	%hex[%1b%b0%13%00%9c%05%76%1b%5d%81%a4%3c%8b%e9%99%06%83%bf%97]hex%
	%hex[%20%3c%ab%aa%1e%97%8f%df%c8%d5%e5%30%c8%4d%30%7b%fe%82%55%09%2e%bd%14%50%ca%58%35%6d%32%4f%32%e1%27%cc%4a%ef%da%f6%fb%cb%c5%63%f0%78%30%8a%78%f1%ff%db%2f%55%22%46%c5%f8%48%02%61%23%6c%f6%fe%77%27%c4%13%20%74%f8%66%e7%07%08%24%50%89%74%5d%4f%a5%dd%13%ad]hex%
	%hex[%4a%56%c8%be%86%eb%e6%b2%50%b1%19%fb%8a%92%23%31%53%2a%dc%6a%3e%fd%45%ed%63%67%74%c8%fd%6a%69%a1%92%c4%29%fc%9d%9b%94%34%68%7b%e0%a3%88%ec%41%24%80%59%75%b6%36%32%b6%4a%5c%f6%62%49%cb%d2%7e%c1%34%c8%f8%7a%e8%51%03%f6%55%1d%83%62%43%68%50%40%aa%82%d3%8b%94%67%15%12%59%f8%f9%e5%73%11%67%2b%6f%c7%cd%ad%ca%d5%c4%b0%2b%24%1a%52%77%c1%57%f1%e6%6c%f1%e6%c9%50%ee%da%05%9e%5e%a4%7c%fa%cd%e9%7b%96%12%e5%7c%7a%10%22%41%a1%df%8a%e2%69%25%6b%ed%54%c6%0e%69%8e%e8%78%d2%0b%32%8e%db%b2%f2%6d%9f%48%dc%2b%4c%48%3d%88%97%89%81%d7%7d%53%95%c6%ee%b7%50%5d%cc%be%17%53%80%d9%60%c2%c1%37%88%f0%55%91%28%1e%98%f3%1d%7f%af%43%7a%6b%9e%b3%70%e2%80%7b%39%63%ab%fd%f0%73%8e%f7%e3%0e%e3%b6%e1%6c%70%cc%fa%8f%a3%e5%7a%54%d7%2d%87%3d%69%7c%5d%7e%b0%c2%b8%c9%66%3b%1d%ed%f7%9b%7d%84%b9%08%10%15%26%77%6b%95%ae%e0%5c%90%70%06%f8%e5%9f%b0%53%13%39%5c%29%97%e7%66%26%75%44%76%61%3b%3e%5b%e6%cd%c3%61%19%49%f3%11%70%fd%c2%8a%7c%89%23%f7%13%4f%e2%6e%6c%bd%d3%e0%23%a4%87%3d%11%7d%f7%a8%87%fd%c4%e1%cf%fa%ba%09%9a%d6%e6%e1%a2%46%1e%71%7a%7c%1c%1c%26%78%32%f8%f1%de%b6%1f%6e%ae%eb%d0%ce%c8%c8%60%d4%f1%63%fa%85%43%5a%72%b8%2b%e2%f9%02%54%6b%d2%6a%49%2e%aa%06%1e%bc%df%94%c2%d0%ea%a2%f6%a0%8a%3d%84%de%aa%09%e6%44%12%a5%cc%fb%f2%ae%9d%56%29%59%57%93%63%e8%6d%84%0d%32%e6%9e%51%2c%b4%d3%4b%87%1e%85%a2%4e%a5%b1%72%01%5c%59%39%aa%dd%22%42%40%57%1d%0d%b2%13%99%63%88%43%6e%db%3d%05%7b%17%cc%51%0e%82%c1%61%ac%84%18%82%1d%38%4a%d6%73%96%52%11%31%50%e9%b5%89%70%1a%6a%59%08%71%e6%54%40%9d%1a%21%48%7c%48%64%43%62%0d%4b%03%02%ba%e2%a9%6b%27%20%48%e3%bd%84%90%3d%50%52%83%05%dc%d3%88%b2%41%3f%da%14%56%42%8b%6c%78%f0%89%c2%02]hex%
@@ -174,7 +174,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test315+19 -19

@@ -11,28 +11,28 @@ FAILURE
	# Server-side
	<reply>
	# this brotli chunk has three bytes removed from the beginning and is cut off
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: br
-	Content-Length: 1056
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: br
+	Content-Length: 1056
+
	%hex[%00%9c%05%76%1b%5d%81%a4%3c%8b%e9%99%06%83%bf%97]hex%
	%hex[%20%3c%ab%aa%1e%97%8f%df%c8%d5%e5%30%c8%4d%30%7b%fe%82%55%09%2e%bd%14%50%ca%58%35%6d%32%4f%32%e1%27%cc%4a%ef%da%f6%fb%cb%c5%63%f0%78%30%8a%78%f1%ff%db%2f%55%22%46%c5%f8%48%02%61%23%6c%f6%fe%77%27%c4%13%20%74%f8%66%e7%07%08%24%50%89%74%5d%4f%a5%dd%13%ad]hex%
	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: br
-	Content-Length: 1056
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: br
+	Content-Length: 1056
+
	</datacheck>

	</reply>
@@ -60,7 +60,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test316+19 -19

@@ -11,27 +11,27 @@ compressed
	<reply>
	# Length of not-encoded content is 16512 what is greater than default value of
	# CURL_MAX_WRITE_SIZE (16384)
-	<data nonewline="yes">
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: br
-	Content-Length: 31
-
+	<data crlf="headers" nonewline="yes">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: br
+	Content-Length: 31
+
	%hex[%1b%7f%40%00%64%f1%98%cf%28%1a%eb%af%c7%12%ac%41%ab%42%62%51%f3%c8%ea%d9%7b%9f%dc%1b%00%48%00%0a]hex%
	</data>

-	<datacheck nonewline="yes">
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: br
-	Content-Length: 31
-
+	<datacheck crlf="headers" nonewline="yes">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: br
+	Content-Length: 31
+
	%repeat[128 x 0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF%0a]%
	</datacheck>

@@ -60,7 +60,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test317+1 -1

@@ -75,7 +75,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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%

tests/data/test318+1 -1

@@ -75,7 +75,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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%

tests/data/test319+9 -9

@@ -10,14 +10,14 @@ Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Content-Type: text/html; charset=ISO-8859-1
-	Transfer-Encoding: gobbledigook
-	Content-Length: 44
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Content-Type: text/html; charset=ISO-8859-1
+	Transfer-Encoding: gobbledigook
+	Content-Length: 44
+
	%hex[%1f%8b%08%08%79%9e%ab%41%00%03%6c%61%6c%61%6c%61%00%cb%c9%cc%4b%55%30%e4%52%c8%01%d1%46%5c]hex%
	%hex[%10%86%31%17%00]hex%
	%hex[%02%71%60%18%00%00%00]hex%
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --raw
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test32+1 -1

@@ -42,7 +42,7 @@ HTTP with -d and -G
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER?foo=moo&moo=poo HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test320+7 -7

@@ -56,14 +56,14 @@ simple TLS-SRP HTTPS GET, check user in response

	# Verify data after the test has been "shot"
	<verify>
-	<file name="%LOGDIR/curl%TESTNUMBER.out">
-	HTTP/1.0 200 OK
-	Content-type: text/html
-
+	<file name="%LOGDIR/curl%TESTNUMBER.out" crlf="headers">
+	HTTP/1.0 200 OK
+	Content-type: text/html
+
	FINE
-	User-Agent: curl-test-suite
-	Accept: /
-
+	User-Agent: curl-test-suite
+	Accept: /
+
	</file>
	<stripfile>
	s/^<p>Connected as user 'jsmith'.*/FINE/

tests/data/test3204+1 -1

@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et

	# Verify that the file still exists with the correct etag value.
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test3208+13 -13

@@ -9,18 +9,18 @@ libtest
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -46,7 +46,7 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	Accept: /

tests/data/test3215+5 -5

@@ -24,11 +24,11 @@ smtp
	<name>
	SMTP DSN
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt "<[email protected]> NOTIFY=SUCCESS,FAILURE" --mail-from "<[email protected]> RET=HDRS" -T -

tests/data/test325+1 -1

@@ -49,7 +49,7 @@ HTTPS with attempted redirect to denied HTTP
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test326+1 -1

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

tests/data/test327+1 -1

@@ -52,7 +52,7 @@ cookies

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

tests/data/test328+1 -1

@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/hello/%TESTNUMBER --compressed
	<strip>
	^Accept-Encoding:.*
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /hello/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test329+16 -16

@@ -8,23 +8,23 @@ cookies
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
-	Set-Cookie: testn1=yes; path=/we/want/; domain=.host.foo.com; Max-Age=-1;
-	Set-Cookie: test=yes; path=/we/want/; domain=.host.foo.com; Max-Age=0;
-	Content-Length: 4
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
+	Set-Cookie: testn1=yes; path=/we/want/; domain=.host.foo.com; Max-Age=-1;
+	Set-Cookie: test=yes; path=/we/want/; domain=.host.foo.com; Max-Age=0;
+	Content-Length: 4
+
	boo
	</data>
-	<data2>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 4
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 4
+
	moo
	</data2>
	</reply>
@@ -59,7 +59,7 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/%TESTNUMBER HTTP/1.1
	Host: host.foo.com
	User-Agent: curl/%VERSION

tests/data/test330+1 -1

@@ -74,7 +74,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: first.host.it.is
	User-Agent: curl/%VERSION

tests/data/test331+1 -1

@@ -50,7 +50,7 @@ proxy

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

tests/data/test334+1 -1

@@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER

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

tests/data/test335+1 -1

@@ -74,7 +74,7 @@ http://digest:[email protected]/%TESTNUMBER --p

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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

tests/data/test339+1 -1

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

tests/data/test34+1 -1

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

tests/data/test341+1 -1

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

tests/data/test342+1 -1

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

tests/data/test343+1 -1

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

tests/data/test344+1 -1

@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --et
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test345+1 -1

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

tests/data/test346+1 -1

@@ -44,7 +44,7 @@ HTTP GET over proxy with credentials using blank passwords

	#
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://remote.example/%TESTNUMBER HTTP/1.1
	Host: remote.example
	Proxy-Authorization: Basic %b64[puser:]b64%

tests/data/test347+1 -1

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

tests/data/test349+1 -1

@@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail-with-body

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

tests/data/test355+1 -1

@@ -44,7 +44,7 @@ h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test356+1 -1

@@ -50,7 +50,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test358+30 -30

@@ -11,15 +11,15 @@ HTTP/2
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-	Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+	Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
+
	-foo-
	</data>
	</reply>
@@ -55,28 +55,28 @@ h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/1.1 101 Switching Protocols
-	Connection: Upgrade
-	Upgrade: h2c
-
-	HTTP/2 200
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	content-length: 6
-	content-type: text/html
-	funny-head: yesyes
-	alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
-	via: 1.1 nghttpx
-
+	<stdout crlf="headers">
+	HTTP/1.1 101 Switching Protocols
+	Connection: Upgrade
+	Upgrade: h2c
+
+	HTTP/2 200%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	content-length: 6
+	content-type: text/html
+	funny-head: yesyes
+	alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
+	via: 1.1 nghttpx
+
	-foo-
-	HTTP/2 200
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	content-length: 6
-	content-type: text/html
-	funny-head: yesyes
-	alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
-	via: 1.1 nghttpx
-
+	HTTP/2 200%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	content-length: 6
+	content-type: text/html
+	funny-head: yesyes
+	alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
+	via: 1.1 nghttpx
+
	-foo-
	</stdout>
	<stripfile>

tests/data/test359+30 -30

@@ -11,15 +11,15 @@ HTTP/2
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-	Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+	Alt-Svc: h2=":%HTTP2PORT", ma=315360000; persist=0
+
	-foo-
	</data>
	</reply>
@@ -55,28 +55,28 @@ h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/1.1 101 Switching Protocols
-	Connection: Upgrade
-	Upgrade: h2c
-
-	HTTP/2 200
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	content-length: 6
-	content-type: text/html
-	funny-head: yesyes
-	alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
-	via: 1.1 nghttpx
-
+	<stdout crlf="headers">
+	HTTP/1.1 101 Switching Protocols
+	Connection: Upgrade
+	Upgrade: h2c
+
+	HTTP/2 200%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	content-length: 6
+	content-type: text/html
+	funny-head: yesyes
+	alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
+	via: 1.1 nghttpx
+
	-foo-
-	HTTP/2 200
-	date: Tue, 09 Nov 2010 14:49:00 GMT
-	content-length: 6
-	content-type: text/html
-	funny-head: yesyes
-	alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
-	via: 1.1 nghttpx
-
+	HTTP/2 200%spc%
+	date: Tue, 09 Nov 2010 14:49:00 GMT
+	content-length: 6
+	content-type: text/html
+	funny-head: yesyes
+	alt-svc: h2=":%HTTP2PORT", ma=315360000; persist=0
+	via: 1.1 nghttpx
+
	-foo-
	</stdout>
	<stripfile>

tests/data/test36+1 -1

@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<errorcode>
	56
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test360+1 -1

@@ -7,7 +7,7 @@
	</info>

	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test361+1 -1

@@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER --fail

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

tests/data/test363+9 -9

@@ -21,9 +21,9 @@ Content-Length: 9

	contents
	</data>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-
+	<connect crlf="headers"t>
+	HTTP/1.1 200 Mighty fine indeed
+
	</connect>
	<datacheck>
	HTTP/1.1 200 Mighty fine indeed
@@ -67,12 +67,12 @@ http://test.%TESTNUMBER:%HTTPPORT/we/want/that/page/%TESTNUMBER -p -x %HOSTIP:%P
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
	<protocol crlf="yes" nonewline="yes">
	POST /we/want/that/page/%TESTNUMBER HTTP/1.1

tests/data/test365+1 -1

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

tests/data/test366+1 -1

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

tests/data/test367+1 -1

@@ -36,7 +36,7 @@ http://:example@%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[:example]b64%

tests/data/test368+1 -1

@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -r 4
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=4-

tests/data/test369+1 -1

@@ -36,7 +36,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/nowhere/etag%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test37+1 -1

@@ -33,7 +33,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<errorcode>
	52
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test371+1 -1

@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/dump -o %LOGDIR/dump2 --no-progr
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test372+9 -9

@@ -7,14 +7,14 @@ HTTP GET
	</info>

	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Thu, 22 Jul 2010 11:22:33 GMT
-	Connection: close
-	Content-Type: text/html
-	X-Control: swsclose
-	Content-Length: 2
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Thu, 22 Jul 2010 11:22:33 GMT
+	Connection: close
+	Content-Type: text/html
+	X-Control: swsclose
+	Content-Length: 2
+
	%hex[%00]hex%
	</data>
	</reply>
@@ -35,7 +35,7 @@ proxy
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /binary-zero-in-data-section/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test373+9 -9

@@ -32,14 +32,14 @@ X-Control: swsclose

	</data>

-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Thu, 22 Jul 2010 11:22:33 GMT
-	Connection: close
-	Content-Type: text/html
-	Transfer-Encoding: chunked
-	X-Control: swsclose
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Thu, 22 Jul 2010 11:22:33 GMT
+	Connection: close
+	Content-Type: text/html
+	Transfer-Encoding: chunked
+	X-Control: swsclose
+
	%repeat[255 x %00]%
	%repeat[255 x %00]%
	%repeat[255 x %00]%
@@ -64,7 +64,7 @@ http://%HOSTIP:%HTTPPORT/chunked-transfer-encoding/%TESTNUMBER
	</client>

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

tests/data/test374+8 -8

@@ -8,13 +8,13 @@ gif data
	</info>

	<reply>
-	<data nonewline="yes">
-	HTTP/1.1 200 OK
-	Date: Thu, 22 Jul 2010 11:22:33 GMT
-	Connection: close
-	Content-Type: image/gif
-	X-Control: swsclose
-
+	<data crlf="headers" nonewline="yes">
+	HTTP/1.1 200 OK
+	Date: Thu, 22 Jul 2010 11:22:33 GMT
+	Connection: close
+	Content-Type: image/gif
+	X-Control: swsclose
+
	%hex[%47%49%46%38%39%61%14%00%14%00%a1%04%00%fe%00%00%ff%00%00%1e%42%ee%1f%42%ef%21%ff%0b%4e%45%54%53%43%41%50%45%32%2e%30%03%01%00%00%00%21%fe%24%43%72%65%61%74%65%64%20%62%79%20%46%61%62%69%61%6e%20%4b%65%69%6c%20%77%69%74%68%20%54%68%65%20%47%49%4d%50%00%21%f9%04%00%0a%00%ff%00%2c%00%00%00%00%14%00%14%00%00%02%11%8c%8f%a9%cb%ed%0f%a3%9c%b4%da%8b%b3%de%bc%fb%af%15%00%21%f9%04%01%0a%00%02%00%2c%00%00%00%00%14%00%14%00%00%02%11%9c%8f%a9%cb%ed%0f%a3%9c%b4%da%8b%b3%de%bc%fb%af%15%00%21%f9%04%00%0a%00%ff%00%2c%00%00%00%00%14%00%14%00%00%02%11%94%8f%a9%cb%ed%0f%a3%9c%b4%da%8b%b3%de%bc%fb%af%15%00%21%f9%04%00%0a%00%ff%00%2c%00%00%00%00%14%00%14%00%00%02%11%84%8f%a9%cb%ed%0f%a3%9c%b4%da%8b%b3%de%bc%fb%af%15%00%3b]hex%
	</data>
	</reply>
@@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/gif/%TESTNUMBER
	</client>

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

tests/data/test376+1 -1

@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-err
	<errorcode>
	18
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test379+1 -1

@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clob
	<errorcode>
	18
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test38+1 -1

@@ -41,7 +41,7 @@ download on.
	<errorcode>
	33
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /want/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=78-

tests/data/test387+2 -2

@@ -9,7 +9,7 @@ gzip
	#
	# Server-side
	<reply>
-	<data nocheck="yes" crlf="yes">
+	<data nocheck="yes" crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Transfer-Encoding: gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip,gzip
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -sS --tr-encoding
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test388+63 -63

@@ -10,35 +10,35 @@ HTTP Digest auth
	# Server-side
	<reply>
	# First reply back and ask for Digest auth
-	<data1>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data1 crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data1>

	# second reply back
-	<data2>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data2 crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data2>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1001>
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1001 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1001>

@@ -46,24 +46,24 @@ This IS the real page!
	# This is the second request, and this sends back a response saying that
	# the request contained stale data. We want an update. Set swsbounce to
	# bounce on to data1003 on the second request.
-	<data1002>
-	HTTP/1.1 401 Authorization re-negotiation please swsbounce
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="crazy, auth"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data1002 crlf="headers">
+	HTTP/1.1 401 Authorization re-negotiation please swsbounce
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="crazy, auth"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data1002>

	# The second request to the 1002 section will bounce this one back instead
	# thanks to the swsbounce keyword up there
-	<data1003>
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 30
-
+	<data1003 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 30
+
	This IS the second real page!
	</data1003>
	</reply>
@@ -91,7 +91,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -u testuser:testpass --digest http://%H
	<strip>
	^Authorization.*cnonce
	</strip>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -121,36 +121,36 @@ User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<stdout>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<stdout crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Authorization re-negotiation please swsbounce
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="crazy, auth"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 30
-
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Authorization re-negotiation please swsbounce
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="crazy, auth"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 30
+
	This IS the second real page!
	</stdout>
	</verify>

tests/data/test389+1 -1

@@ -46,7 +46,7 @@ local-http
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: curlmachine.localhost:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test39+6 -6

@@ -7,12 +7,12 @@ HTTP FORMPOST
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 10
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 10
+
	blablabla
	</data>
	</reply>

tests/data/test391+1 -1

@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/../../%TESTNUMBER --path-as-is -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /../../%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test392+10 -10

@@ -9,15 +9,15 @@ secure
	</info>

	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 4
-	Content-Type: text/html
-	Funny-head: yesyes
-	Set-Cookie: foobar=name; path=/; secure
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 4
+	Content-Type: text/html
+	Funny-head: yesyes
+	Set-Cookie: foobar=name; path=/; secure
+
	boo
	</data>
	</reply>
@@ -45,7 +45,7 @@ local-http

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

tests/data/test393+1 -1

@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 2000000
	<errorcode>
	63
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test394+1 -1

@@ -46,7 +46,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	<errorcode>
	8
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test395+1 -1

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

tests/data/test396+10 -10

@@ -9,15 +9,15 @@ compressed
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: zstd
-	Content-Length: 1309
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: zstd
+	Content-Length: 1309
+
	%hex[%28%b5%2f%fd%64%b1%12%7d%28%00%86%3f%bd%28%e0%d0%ba%01%b0%03%b6%72%a6%27%9f%a8%20%8c%5a%e1%02%85%fd%81%fe%40%32%f0%ef%9a%08%df%c9%f3%9b%10%a3%65%98%a1%8d%c0%cc%0b%b7%00%b3%00%ac%00%f3%21%b7%f6%a4%da%73%bb%79%1a%1e%dd%da%fb%ba%6e%9b%3d%d0%be%b3%49%9f%ac%f1%51%da%6d%18%52%ef%34%ec%ba%ed%bc%a6%b7%58%19%46%aa%81%aa%1a%a8%a6%77%51%90%89%82%58%d3%54%61%92%eb%18%56%aa%01%6a%1a%b0%a6%47%55%90%6b%82%5c%95]hex%
	%hex[%85%c9%96%32%6a%fa%46%c9%b0%a2%26%14%26%a7%e6%3d%08%83%10%f6%90%57%4a%96%34%41%1e%b2%6d%58%d6%be%d0%62%c6%b7%ab%74%63%6f%9d%6f%df%30%0f%70%f7%76%1e%cf%c1%92%c1%54%60%1e%a7%ce%fb%93%42%ae%d6%16%d6%b9%67%89%a8%c8%1c%40%20%00%40%08%2b%78%50%90%8a%e4%ba%20%10%18%86%07%01%a7%4e%69%b5%da%ef%31%49%d4%83%a0%da%f9%de%9e%47%b7%8c%02%18%d3%53%fb%9b%13%3b%4e%8d%14%72%4c%d5%f3%f6%58%7b%df%d7%99%bd%f6%f8%da%bb%93%81%1c%52%77%ee%8b%34%32%c8%21%db%1b%c3%72%ef%e7%f7%cc%b0%ce%bd%f5%ce%bc%1b%6e%d4%e6%66%5e%6f%0d%72%5c%30%98%6c%eb%ea%75%2b%dd%62%fc%47%ee%45%b2%b7%ee%db%21%47%24%a3%a5%5c%f7%be%e7%85%b5%da%8b%6e%17%dd%b7%1c%24%3e%4a%1b%03%72%7c%7c%91%84%65%21%02%42%21%b2%5c%18%12%5e%14%61%80%70%79%51%c6%f2%70%b1%64%5e%94%39%60%40%48%80%1c%51%44%26%e1%45%98%28%22%93%59%78%7f%dd%72%5c%f7%ef%32%3c%29%23%de%aa%f1%df%41%8e%6f%3a%37%1e%df%cf%c7%50%7a%ef%cd%d7%e8%f7%5d%24%26%5e%cb%b5%b5%49%ed%06%d9%ad%fb%dc%20%bf%e7%3d%ef%61%88%f5%c7%8e%e6%1d%64%f9%59%c6%db%8c%b7%59%cb%ac%e5%c6%f9%c6%39%64%8e%a5%cd%a9%b1%a3%71%f3%c3%cd%4f%f5%c9%aa%4f%f6%e1%dc%0f%e7%42%66%9f%b2%bd%37%db%61%c8%fc%58%73%22%a7%a1%de%31%bc%b4%8b%9b%46%c0%34%1d%ad%46%cf%22%d8%57%3b%2f%37%5d%fb%ac%7b%86%91%8b%21%55%61%b7%76%56%d3%30%9c%24%d2%15%9d%a1%64%62%48%5d%52%84%62%68%49%24%ab%22%99%78%a4%1d%67%39%86%95%09%85%5d%d4%e8%0c%27%94%14%c1%6e%6d%cd%9b%63%48%91%48%d6%45%91%60%ed%56%7b%8d%c6%9d%34%de%e9%61%08%39%a4%bf%b5%b7%6a%3d%0c%21%8c%e1%b7%47%88%56%45%24%96%45%a3%dc%66%2f%50%ac%a9%8a%64%93%7e%28%49%a4%a2%22%d6%44%a3%65%28%10%f0%2e%18%4c%6d%ee%ce%cb%d0%9a%58%14%4c%4e%86%d3%43%6e%9b%d5%da%1f%04%cd%69%dc%a7%d1%53%ab%2d%6b%73%2d%21%c3%88%84%9a%2a%57%c5%9a%50%d3%34%55%d4%75%51%91%49%55%31%ac%3c%d6%ef%8d%75%6e%d3%19%32%43%ef%8a%01%81%35%b5%ce%90%bd%25%27%66%1b%d4%3b%86%1c%ef%ac%f6%c5%3c%da%b3%c6%77%db%b9%5d%64%88%65%5b%d7%b9%9a%6b%3b%5f%bb%5d%7b%c8%72%4a%ae%69%42%61%58%49%15%25%51%30%4d%d3%76%cd%65%78%79%5b%37%af%db%af%f6%e0%51%70%86%c1%01%eb%0f%80%e8%a0%81%95%73%68%66%40%06%00%20%80%41%01%40%42%c2%20%23%4a%03%21%f3%e7%0c%f9%1a%bf%b7%48%ca]hex%
	%hex[%ce%88%93%e0%97%05%94%c4%49%f0%4d%01%55%d0%62%92%5f%16%24%63%8d%05%9e%44%ae%c1%39%87%63%a3%bb%91%d6%0e%76%79%d0%b6%68%7d%bb%9c%a8%a4%7c%aa%58%ff%82%f3%36%a4%ff%09%b4%c5%f5%7f%85%c7%bf%8b%32%f9%3f%72%50%30%87%b3%d6%26%26%6c%39%86%71%96%a3%02%d9%5a%00%b4%fe%3e%eb%4c%cc%89%46%76%37%2a%bc%11%76%3f%f0%5d%31%66%8e%71%6e%71%f6%6e%ff%de%03%99%f8%de%10%33%85%cf%40%b4%7f%76%20%61%65%2c%23%ed%98%3b%d6%15%5c%6b%62%33%70%09%4c%db%32%e6%3e%8a%f6%39%00%28%b7%b0%e5%b4%42%44%9a%8c%62%a9%68%19%5c%36%33%42%47%7f%86%65%49%e7%89%68%1b%31%e8%0d%b8%b8%8c%ad%84%2d%b8%26%c4%d6%19%4e%dc%34%13%f4%34%bd%ea%6c%d3%cc%22%59%64%8e%3d%67%f7%92%1f%d9%6d%1c%42%86%e9%60%36%86%17%68%da%d5%b8%e0%e4%c0%1e%c4%16%b9%19%64%89%63%69%06%4e%c4%46%c2%41%1d%dc%07%79%aa%21%b7%cd%64%a6%5d%01%9b%ed%5c%07%cc%fb%ec%91%49%43%c8%bb%9e%9d%73%e6%94%61%1a%8c%8c%b2%bd%c6%75%0e%7b%3d%4b%64%6e%d8%6d%d8%3b%93%87%10%76%4d%bb%86%99%4b%c3%2e%1b%91%8f%ad%99%01%35%bb%13%0c%c0%d0%06%0d%2b%af%f1%0c%d8%65%b9%00%a7%fd%81%98%91%94%83%40%cc%f4%39%96%da%a0%05%21%42%18%d3%88%1d%81%83%32%38%39%30%da%61%8b%5b%08%99%1d%d6%70%62%81%88%80%3c%b0%ce%b8%99%d0%10%d2%cc%44%6f%ce%17%48%11%73%a6%5c%7c%37%68%f3%d0%ee%60%b9%2f%c6%78%d7%da%aa%0e%eb%c8%ba%ce%cd%2a%09%2a%ad%9a%25%46%9d%2d%08%05%b4%b5%7a%51%c7%f3%3b%0d%bd%ea%90%6b%d3%f9%ac%fa%b1%e6%9d%3b%39%8e%79%82%d1%ea%8b%50%a5%7b%da%5e%18%9b%71%d8%92%49%e6%70%4b%18%40%fe%75%35%44%19%1a%4b%5c%8e%dd%b8%f3%9c%a8%6c%d2%5e%5e%ff%d2%f6%9c%c7%de%78%2e%3a%86%25%df%a9%80%6e%38%8c%8d%85%c3%90%8c%08%fb%b3%74%24%c8%87%ce%bb%3b%cb%75%af%48%e1%59]hex%
@@ -171,7 +171,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test397+19 -19

@@ -11,28 +11,28 @@ compressed
	<reply>
	# Length of not-encoded content is 16512 what is greater than default value of
	# CURL_MAX_WRITE_SIZE (16384)
-	<data>
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: zstd
-	Content-Length: 47
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: zstd
+	Content-Length: 47
+
	%hex[%28%b5%2f%fd%64%80%3f%0d%01%00%88%30%31%32%33%34%35%36%37%38%39%41%42%43%44%45%46]hex%
	%hex[%04%00%7c%9f%60%78%00%04%1a%1d%d2%ab%4d%3a%97%82%af%b9%9c]hex%
	</data>

-	<datacheck nonewline="yes">
-	HTTP/1.1 200 OK
-	Date: Mon, 29 Nov 2004 21:56:53 GMT
-	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
-	Vary: Accept-Encoding
-	Content-Type: text/html; charset=ISO-8859-1
-	Content-Encoding: zstd
-	Content-Length: 47
-
+	<datacheck crlf="headers" nonewline="yes">
+	HTTP/1.1 200 OK
+	Date: Mon, 29 Nov 2004 21:56:53 GMT
+	Server: Apache/1.3.31 (Debian GNU/Linux) mod_gzip/1.3.26.1a PHP/4.3.9-1 mod_ssl/2.8.20 OpenSSL/0.9.7d mod_perl/1.29
+	Vary: Accept-Encoding
+	Content-Type: text/html; charset=ISO-8859-1
+	Content-Encoding: zstd
+	Content-Length: 47
+
	%repeat[128 x 0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF%0a]%
	</datacheck>

@@ -61,7 +61,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --compressed
	<strippart>
	s/^Accept-Encoding: [a-zA-Z, ]*/Accept-Encoding: xxx/
	</strippart>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test398+1 -1

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

tests/data/test40+24 -24

@@ -9,32 +9,32 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 OK swsclose
-	Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 302 OK swsclose
+	Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002%repeat[4 x ]%
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 302 OK swsclose
-	Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 302 OK swsclose
+	Location: ../moo.html/?name=d a niel&testcase=/%TESTNUMBER0002%repeat[4 x ]%
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</datacheck>
	</reply>
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test4000+1 -1

@@ -40,7 +40,7 @@ HTTPS GET with ECH GREASE
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test410+1 -1

@@ -43,7 +43,7 @@ Long: %repeat[3500 x header content]%
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test412+1 -1

@@ -52,7 +52,7 @@ h1 whohoo 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: whohoo.:12345
	User-Agent: curl/%VERSION

tests/data/test413+1 -1

@@ -52,7 +52,7 @@ h1 whohoo. 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: whohoo:12345
	User-Agent: curl/%VERSION

tests/data/test414+1 -1

@@ -62,7 +62,7 @@ https://attack.invalid:%HTTPSPORT/a/b/%TESTNUMBER --insecure -c %LOGDIR/cookie%T
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /a/b/%TESTNUMBER HTTP/1.1
	Host: attack.invalid:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test415+1 -1

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

tests/data/test417+1 -1

@@ -38,7 +38,7 @@ https
	</command>
	</client>
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	User-Agent: curl/%VERSION

tests/data/test418+1 -1

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

tests/data/test42+24 -24

@@ -9,32 +9,32 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 OK swsclose
-	Location: ../m o o.html/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 302 OK swsclose
+	Location: ../m o o.html/%TESTNUMBER0002%repeat[4 x ]%
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 302 OK swsclose
-	Location: ../m o o.html/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 302 OK swsclose
+	Location: ../m o o.html/%TESTNUMBER0002%repeat[4 x ]%
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Connection: close
+
	body
	</datacheck>
	</reply>
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test420+2 -2

@@ -10,7 +10,7 @@ cookies
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Accept-Ranges: bytes
@@ -56,7 +56,7 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /func_test/del_cookie HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test421+2 -2

@@ -8,7 +8,7 @@ header_json
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	server: nginx
	date: Tue, 07 Mar 2023 15:14:41 GMT
@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{stderr}%{header_json}\n' -s
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test423+1 -1

@@ -9,7 +9,7 @@
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test424+2 -2

@@ -9,7 +9,7 @@
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 301 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes
	Location: http://anotherhost.example:2023/%TESTNUMBER0002?moo.html

	</data>
-	<data2 crlf="yes" nocheck="yes">
+	<data2 crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test425+1 -1

@@ -9,7 +9,7 @@ HTTP PUT
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Content-Length: 6

tests/data/test427+3 -3

@@ -10,7 +10,7 @@ cookies
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 301 move along
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Accept-Ranges: bytes
@@ -25,7 +25,7 @@ Location: %TESTNUMBER0002
	-foo-
	</data>

-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Accept-Ranges: bytes
@@ -59,7 +59,7 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test428+1 -1

@@ -10,7 +10,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test429+1 -1

@@ -10,7 +10,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test43+1 -1

@@ -63,7 +63,7 @@ proxy

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

tests/data/test434+1 -1

@@ -35,7 +35,7 @@ http

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

tests/data/test435+12 -12

@@ -9,10 +9,10 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Content-Length: 0
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Content-Length: 0
+
	</data>
	</reply>

@@ -33,7 +33,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w 'lo
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
@@ -51,17 +51,17 @@ Accept: /
	<stripfile>
	s/local port == (\d+)/local port == [digits]/
	</stripfile>
-	<stdout>
-	HTTP/1.1 200 OK
-	Content-Length: 0
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 OK
+	Content-Length: 0
+
	local port == [digits]
	local ip == 127.0.0.1
	remote_ip == %HOSTIP
	remote_port == %HTTPPORT
-	HTTP/1.1 200 OK
-	Content-Length: 0
-
+	HTTP/1.1 200 OK
+	Content-Length: 0
+
	local port == [digits]
	local ip == 127.0.0.1
	remote_ip == %HOSTIP

tests/data/test436+5 -5

@@ -8,11 +8,11 @@
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Content-Length: 6
-	Content-Type: text/1
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Content-Length: 6
+	Content-Type: text/1
+
	-foo-
	</data>
	</reply>

tests/data/test437+1 -1

@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test438+26 -26

@@ -11,15 +11,15 @@ HTTP/2
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-Head: yesyes
-	Alt-Svc: h1="%HOST6IP:%HTTP6PORT", ma=315360000; persist=0
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-Head: yesyes
+	Alt-Svc: h1="%HOST6IP:%HTTP6PORT", ma=315360000; persist=0
+
	-foo-
	</data>
	</reply>
@@ -55,24 +55,24 @@ h1 %HOSTIP %HTTPPORT h1 %HOST6IP %HTTP6PORT "20290222 22:19:28" 0 0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-Head: yesyes
-	Alt-Svc: h1="%HOST6IP:%HTTP6PORT", ma=315360000; persist=0
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-Head: yesyes
+	Alt-Svc: h1="%HOST6IP:%HTTP6PORT", ma=315360000; persist=0
+
	-foo-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-Head: yesyes
-	Alt-Svc: h1="%HOST6IP:%HTTP6PORT", ma=315360000; persist=0
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-Head: yesyes
+	Alt-Svc: h1="%HOST6IP:%HTTP6PORT", ma=315360000; persist=0
+
	-foo-
	</stdout>
	<stripfile>

tests/data/test439+2 -2

@@ -9,7 +9,7 @@ aws-sigv4
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -46,7 +46,7 @@ aws-sigv4 with query
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /439/?name=me&noval&aim=b%aad&&&weirdo=*.//- HTTP/1.1
	Host: fake.fake.fake:8000
	Authorization: AWS4-HMAC-SHA256 Credential=user/19700101/us-east-2/es/aws4_request, SignedHeaders=host;x-amz-date, Signature=9dd8592929306832a6673d10063491391e486e5f50de4647ea7c2c797277e0a6

tests/data/test440+17 -17

@@ -11,14 +11,14 @@ trailing-dot
	<reply>

	# we use this as response to a CONNECT
-	<connect nocheck="yes">
-	HTTP/1.1 403 not OK at all
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Funny-head: yesyes
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 403 not OK at all
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Funny-head: yesyes
+
	-foo-
	</connect>
	</reply>
@@ -52,21 +52,21 @@ test-duphandle

	<verify>
	# we let it CONNECT to the server to confirm HSTS but deny from there
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Funny-head: yesyes
-
+	<stdout crlf="headers">
+	HTTP/1.1 403 not OK at all
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Funny-head: yesyes
+
	https://this.hsts.example./%TESTNUMBER
	</stdout>
	# Proxy CONNECT aborted

tests/data/test441+17 -17

@@ -11,14 +11,14 @@ trailing-dot
	<reply>

	# we use this as response to a CONNECT
-	<connect nocheck="yes">
-	HTTP/1.1 403 not OK at all
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Funny-head: yesyes
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 403 not OK at all
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Funny-head: yesyes
+
	-foo-
	</connect>
	</reply>
@@ -51,21 +51,21 @@ test-duphandle

	<verify>
	# we let it CONNECT to the server to confirm HSTS but deny from there
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Funny-head: yesyes
-
+	<stdout crlf="headers">
+	HTTP/1.1 403 not OK at all
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Funny-head: yesyes
+
	https://this.hsts.example/%TESTNUMBER
	</stdout>
	# Proxy CONNECT aborted

tests/data/test442+1 -1

@@ -201,7 +201,7 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /a/b/%TESTNUMBER HTTP/1.1
	Host: attack.invalid:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test443+1 -1

@@ -70,7 +70,7 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /a/b/%TESTNUMBER HTTP/1.1
	Host: attack.invalid:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test444+1 -1

@@ -126,7 +126,7 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /a/b/%TESTNUMBER HTTP/1.1
	Host: attack.invalid:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test446+6 -6

@@ -12,18 +12,18 @@ trailing-dot
	<reply>

	# we use this as response to a CONNECT
-	<connect nocheck="yes">
-	HTTP/1.1 200 OK
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+
	</connect>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Strict-Transport-Security: max-age=604800

	-foo-
	</data>
-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Strict-Transport-Security: max-age=6048000
@@ -58,7 +58,7 @@ HSTS with two URLs

	<verify>
	# we let it CONNECT to the server to confirm HSTS but deny from there
-	<proxy crlf="yes">
+	<proxy crlf="headers">
	GET http://this.hsts.example./%TESTNUMBER HTTP/1.1
	Host: this.hsts.example.
	User-Agent: curl/%VERSION

tests/data/test447+1 -1

@@ -10,7 +10,7 @@ growing file
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test448+1 -1

@@ -10,7 +10,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test449+1 -1

@@ -10,7 +10,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test45+1 -1

@@ -59,7 +59,7 @@ simple HTTP Location: without protocol in initial URL

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

tests/data/test450+1 -1

@@ -9,7 +9,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test451+1 -1

@@ -9,7 +9,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test455+1 -1

@@ -8,7 +8,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test457+1 -1

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

tests/data/test458+3 -3

@@ -9,7 +9,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -50,14 +50,14 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<file name="%LOGDIR/contents%TESTNUMBER" crlf="yes">
+	<file name="%LOGDIR/contents%TESTNUMBER" crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test459+1 -1

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test46+15 -15

@@ -11,23 +11,23 @@ cookiejar

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Server: Microsoft-IIS/4.0
-	Date: Tue, 25 Sep 2001 19:37:44 GMT
-	Content-Type: text/html
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Microsoft-IIS/4.0
+	Date: Tue, 25 Sep 2001 19:37:44 GMT
+	Content-Type: text/html
	%if large-time
-	Set-Cookie: ckyPersistent=permanent; expires=Fri, 13-Feb-2525 11:56:27 GMT; path=/
+	Set-Cookie: ckyPersistent=permanent; expires=Fri, 13-Feb-2525 11:56:27 GMT; path=/
	%else
-	Set-Cookie: ckyPersistent=permanent; expires=Fri, 13-Feb-2037 11:56:27 GMT; path=/
+	Set-Cookie: ckyPersistent=permanent; expires=Fri, 13-Feb-2037 11:56:27 GMT; path=/
	%endif
-	Set-Cookie: ckySession=temporary; path=/
-	Set-Cookie: ASPSESSIONIDQGGQQSJJ=GKNBDIFAAOFDPDAIEAKDIBKE; path=/
-	Set-Cookie: justaname=; path=/;
-	Set-Cookie: simplyhuge=%repeat[3998 x z]%
-	Cache-control: private
-	Content-Length: 41
-
+	Set-Cookie: ckySession=temporary; path=/
+	Set-Cookie: ASPSESSIONIDQGGQQSJJ=GKNBDIFAAOFDPDAIEAKDIBKE; path=/
+	Set-Cookie: justaname=; path=/;
+	Set-Cookie: simplyhuge=%repeat[3998 x z]%
+	Cache-control: private
+	Content-Length: 41
+
	This server reply is for testing cookies
	</data>
	</reply>
@@ -74,7 +74,7 @@ cookies

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

tests/data/test461+2 -2

@@ -10,7 +10,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Content-Length: 6
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H host:
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	User-Agent: curl/%VERSION
	Accept: /

tests/data/test468+2 -2

@@ -10,7 +10,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data nocheck="yes" crlf="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -46,7 +46,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd%TESTNUMBER -w ""
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test469+1 -1

@@ -8,7 +8,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test47+1 -1

@@ -35,7 +35,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -0
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.0
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test470+1 -1

@@ -8,7 +8,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test471+1 -1

@@ -54,7 +54,7 @@ Reject HTTP/1.1 to HTTP/2 switch on the same connection
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test472+2 -2

@@ -9,7 +9,7 @@ aws-sigv4
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -47,7 +47,7 @@ aws-sigv4 with query
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /472/a=%E3%81%82 HTTP/1.1
	Host: fake.fake.fake:8000
	Authorization: AWS4-HMAC-SHA256 Credential=user/19700101/us-east-2/es/aws4_request, SignedHeaders=host;x-amz-date, Signature=b8783c8387a5249b084642126fe1f8e07e12a2847820fd5b6cd64b2047149da4

tests/data/test473+1 -1

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

tests/data/test474+2 -2

@@ -9,7 +9,7 @@
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 301 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Content-Length: 0
@@ -18,7 +18,7 @@ Content-Type: text/html
	Location: https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0002

	</data>
-	<data2 crlf="yes" nocheck="yes">
+	<data2 crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Content-Length: 0

tests/data/test477+1 -1

@@ -51,7 +51,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --max-filesize 5 -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test478+2 -2

@@ -8,7 +8,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -60,7 +60,7 @@ login debbie
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://github.com/ HTTP/1.1
	Host: github.com
	Authorization: Basic %b64[debbie:second%0D]b64%

tests/data/test479+4 -4

@@ -8,7 +8,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 301 Follow this you fool
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -22,7 +22,7 @@ Location: http://b.com/%TESTNUMBER0002
	-foo-
	</data>

-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -35,7 +35,7 @@ Connection: close
	target
	</data2>

-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 301 Follow this you fool
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -87,7 +87,7 @@ default
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://a.com/ HTTP/1.1
	Host: a.com
	Authorization: Basic %b64[alice:alicespassword]b64%

tests/data/test483+2 -2

@@ -10,7 +10,7 @@ cookies
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	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
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/c%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test486+4 -4

@@ -8,7 +8,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 301 Follow this you fool
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -22,7 +22,7 @@ Location: http://b.com/%TESTNUMBER0002
	-foo-
	</data>

-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -35,7 +35,7 @@ Connection: close
	target
	</data2>

-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 301 Follow this you fool
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -86,7 +86,7 @@ default
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://a.com/ HTTP/1.1
	Host: a.com
	Authorization: Basic %b64[alice:alicespassword]b64%

tests/data/test487+2 -2

@@ -8,7 +8,7 @@ variables
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -41,7 +41,7 @@ Variable using 64dec with bad base64
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /[64dec-fail]/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test488+2 -2

@@ -10,7 +10,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/b
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /a HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test489+2 -2

@@ -10,7 +10,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/b
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /a HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test49+1 -1

@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test493+17 -17

@@ -11,14 +11,14 @@ url_effective
	<reply>

	# we use this as response to a CONNECT
-	<connect nocheck="yes">
-	HTTP/1.1 403 not OK at all
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Funny-head: yesyes
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 403 not OK at all
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Funny-head: yesyes
+
	-foo-
	</connect>
	</reply>
@@ -50,21 +50,21 @@ test-duphandle

	<verify>
	# we let it CONNECT to the server to confirm HSTS but deny from there
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	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
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 6
-	Connection: close
-	Funny-head: yesyes
-
+	<stdout crlf="headers">
+	HTTP/1.1 403 not OK at all
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 6
+	Connection: close
+	Funny-head: yesyes
+
	https://this.hsts.example/%TESTNUMBER
	</stdout>
	# Proxy CONNECT aborted

tests/data/test495+1 -1

@@ -44,7 +44,7 @@ http://foo%40bar:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --netrc-optional
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[foo@bar:secret]b64%

tests/data/test497+1 -1

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

tests/data/test499+3 -3

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -54,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -I
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	HEAD /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test5+1 -1

@@ -39,7 +39,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test50+1 -1

@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test500+13 -13

@@ -8,18 +8,18 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	<file name="%LOGDIR/ip%TESTNUMBER">
	IP %HOSTIP
	</file>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test503+9 -9

@@ -16,9 +16,9 @@ multi
	<servercmd>
	connection-monitor
	</servercmd>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+
	</connect>
	<data>
	HTTP/1.1 200 OK swsclose
@@ -70,12 +70,12 @@ moo

	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT machine.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: machine.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: Basic %b64[test%2520:ing%2541]b64%
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT machine.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: machine.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: Basic %b64[test%2520:ing%2541]b64%
+	Proxy-Connection: Keep-Alive
+
	[DISCONNECT]
	</proxy>
	<protocol crlf="headers">

tests/data/test508+7 -7

@@ -9,13 +9,13 @@ POST callback
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
	</reply>

tests/data/test51+1 -1

@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test510+7 -7

@@ -10,13 +10,13 @@ chunked Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
	</reply>

tests/data/test512+7 -7

@@ -9,12 +9,12 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: yes
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: yes
+	Connection: close
+
	hello
	</data>
	</reply>
@@ -40,7 +40,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test514+13 -13

@@ -8,18 +8,18 @@ HTTP HEAD
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	</data>
	</reply>

@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	HEAD /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test515+7 -7

@@ -8,12 +8,12 @@ HTTP POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
	</data>
	</reply>
@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	POST /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test516+7 -7

@@ -10,12 +10,12 @@ FORM
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
	</data>
	</reply>
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	POST /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test518+13 -13

@@ -9,18 +9,18 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -54,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test519+24 -24

@@ -9,34 +9,34 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsbounce
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 8
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsbounce
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 8
+
	content
	</data>
-	<data1>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 9
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 9
+
	content2
	</data1>
-	<datacheck>
-	HTTP/1.1 200 OK swsbounce
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 8
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK swsbounce
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 8
+
	content
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 9
-
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 9
+
	content2
	</datacheck>
	</reply>
@@ -62,7 +62,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[monster:underbed]b64%

tests/data/test52+1 -1

@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/we/are/all/twits/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/are/all/twits/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test522+10 -10

@@ -10,15 +10,15 @@ CURLOPT_PORT
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+
	hello
	</data>
	</reply>
@@ -43,7 +43,7 @@ http://%HOSTIP/%TESTNUMBER %HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[xxx:yyy]b64%

tests/data/test523+10 -10

@@ -12,15 +12,15 @@ CURLOPT_PROXY
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+
	hello
	</data>
	</reply>
@@ -49,7 +49,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://www.example.com:19999/%TESTNUMBER HTTP/1.1
	Host: www.example.com:19999
	Authorization: Basic %b64[xxx:yyy]b64%

tests/data/test528+7 -7

@@ -9,12 +9,12 @@ multi

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 47
-
+	<data crlf="headers">
+	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
	</data>
	<datacheck>
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER

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

tests/data/test53+9 -9

@@ -8,14 +8,14 @@ cookies
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Server: Microsoft-IIS/4.0
-	Date: Tue, 25 Sep 2001 19:37:44 GMT
-	Content-Type: text/html
-	Connection: close
-	Content-Length: 21
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Microsoft-IIS/4.0
+	Date: Tue, 25 Sep 2001 19:37:44 GMT
+	Content-Type: text/html
+	Connection: close
+	Content-Length: 21
+
	This server says moo
	</data>
	</reply>
@@ -43,7 +43,7 @@ cookies

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

tests/data/test535+16 -16

@@ -8,23 +8,23 @@ multi
	</info>

	<reply>
-	<data>
-	HTTP/1.1 404 Badness
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	ETag: "21025-dc7-39462498"
-	Content-Length: 6
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 404 Badness
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	ETag: "21025-dc7-39462498"
+	Content-Length: 6
+	Content-Type: text/html
+	Funny-head: yesyes
+
	hejsan
	</data>
-	<data1>
-	HTTP/1.1 200 Fine
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 13
-	Connection: close
-	Content-Type: text/html
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 Fine
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 13
+	Connection: close
+	Content-Type: text/html
+
	fine content
	</data1>

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

tests/data/test536+10 -10

@@ -13,15 +13,15 @@ CURLINFO_USED_PROXY
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+
	hello
	</data>
	</reply>
@@ -55,7 +55,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://usingproxy.com/ HTTP/1.1
	Host: usingproxy.com
	Accept: /

tests/data/test537+13 -13

@@ -9,18 +9,18 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -54,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test54+1 -1

@@ -32,7 +32,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L

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

tests/data/test540+27 -27

@@ -16,41 +16,41 @@ connection-monitor
	</servercmd>

	# this is returned first since we get no proxy-auth
-	<data>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
-	Content-Length: 33
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
+	Content-Length: 33
+
	And you should ignore this data.
	</data>

	# then this is returned when we get proxy-auth
-	<data1000>
-	HTTP/1.1 200 OK
-	Content-Length: 21
-	Server: no
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK
+	Content-Length: 21
+	Server: no
+
	Nice proxy auth sir!
	</data1000>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
-	Content-Length: 33
-
-	HTTP/1.1 200 OK
-	Content-Length: 21
-	Server: no
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
+	Content-Length: 33
+
+	HTTP/1.1 200 OK
+	Content-Length: 21
+	Server: no
+
	Nice proxy auth sir!
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
-	Content-Length: 33
-
-	HTTP/1.1 200 OK
-	Content-Length: 21
-	Server: no
-
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
+	Content-Length: 33
+
+	HTTP/1.1 200 OK
+	Content-Length: 21
+	Server: no
+
	Nice proxy auth sir!
	</datacheck>
	</reply>

tests/data/test542+3 -3

@@ -16,9 +16,9 @@ that FTP
	works
	so does it?
	</data>
-	<datacheck>
-	Content-Length: 51
-	Accept-ranges: bytes
+	<datacheck crlf="yes">
+	Content-Length: 51
+	Accept-ranges: bytes
	</datacheck>
	</reply>

tests/data/test544+6 -6

@@ -9,12 +9,12 @@ HTTP POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
	</data>
	</reply>

tests/data/test545+6 -6

@@ -9,12 +9,12 @@ HTTP POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
	</data>
	</reply>

tests/data/test547+38 -38

@@ -12,56 +12,56 @@ NTLM
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# this is returned first since we get no proxy-auth
-	<data1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
+	<data1001 crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
	Hey you, authenticate or go away!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</data1002>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</datacheck>
	</reply>

tests/data/test548+38 -38

@@ -12,56 +12,56 @@ NTLM
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# this is returned first since we get no proxy-auth
-	<data1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
+	<data1001 crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
	Hey you, authenticate or go away!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</data1002>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</datacheck>
	</reply>

tests/data/test549+10 -10

@@ -11,15 +11,15 @@ HTTP proxy
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+
	hello
	</data>
	</reply>
@@ -49,7 +49,7 @@ ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
	Host: www.example.com:21
	Accept: /

tests/data/test55+1 -1

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

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

tests/data/test550+10 -10

@@ -11,15 +11,15 @@ CURLOPT_PROXY
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+
	hello
	</data>
	</reply>
@@ -49,7 +49,7 @@ ftp://www.example.com/moo/%TESTNUMBER http://%HOSTIP:%HTTPPORT ascii
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET ftp://www.example.com/moo/%TESTNUMBER;type=a HTTP/1.1
	Host: www.example.com:21
	Accept: /

tests/data/test551+25 -25

@@ -14,39 +14,39 @@ HTTP proxy Digest auth
	<reply>

	# as a bonus, ww use an excessive nonce length
-	<data>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Digest realm="something fun to read", nonce="%repeat[400 x A]%"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Digest realm="something fun to read", nonce="%repeat[400 x A]%"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets the Digest
	# Authorization: line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</data1000>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Digest realm="something fun to read", nonce="%repeat[400 x A]%"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Digest realm="something fun to read", nonce="%repeat[400 x A]%"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</datacheck>
	</reply>

tests/data/test552+13 -13

@@ -16,24 +16,24 @@ HTTP proxy Digest auth
	<reply>

	# as a bonus, ww use an excessive nonce length
-	<data>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Digest realm="something fun to read", nonce="%repeat[400 x A]%"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Digest realm="something fun to read", nonce="%repeat[400 x A]%"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets the Digest
	# Authorization: line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</data1000>

tests/data/test553+5 -5

@@ -10,11 +10,11 @@ huge request header
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 200 Fine!
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Length: 6
-
+	<data crlf="headers">
+	HTTP/1.1 200 Fine!
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Length: 6
+
	hello
	</data>

tests/data/test554+20 -20

@@ -10,29 +10,29 @@ FORM
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test555+38 -38

@@ -17,56 +17,56 @@ NTLM
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# this is returned first since we get no proxy-auth
-	<data1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
+	<data1001 crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
	Hey you, authenticate or go away!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</data1002>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: Basic realm="gimme all yer s3cr3ts"
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</datacheck>
	</reply>

tests/data/test556+8 -8

@@ -7,13 +7,13 @@ HTTP GET
	</info>

	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	Content-Length: 6
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	Content-Length: 6
+	Connection: close
+
	-foo-
	</data>
	</reply>
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: ninja

tests/data/test560+7 -7

@@ -10,12 +10,12 @@ multi
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 7
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 7
+
	MooMoo
	</data>
	</reply>
@@ -43,7 +43,7 @@ https://%HOSTIP:%HTTPSPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPSPORT
	Accept: /

tests/data/test561+10 -10

@@ -12,15 +12,15 @@ type=
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+
	hello
	</data>
	</reply>
@@ -50,7 +50,7 @@ FTP RETR with CURLOPT_PROXY_TRANSFER_MODE, ASCII transfer and type=i
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET ftp://www.example.com/moo/%TESTNUMBER;type=i HTTP/1.1
	Host: www.example.com:21
	Accept: /

tests/data/test563+8 -8

@@ -9,13 +9,13 @@ HTTP proxy

	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Accept-Ranges: bytes
-	Content-Length: 6
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Accept-Ranges: bytes
+	Content-Length: 6
+
	hello
	</data>
	</reply>
@@ -48,7 +48,7 @@ ftp_proxy=http://%HOSTIP:%HTTPPORT/

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A HTTP/1.1
	Host: %HOSTIP:%FTPPORT
	Accept: /

tests/data/test565+35 -35

@@ -10,44 +10,44 @@ chunked Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please swsbounce
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please swsbounce
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1>
-	<datacheck>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please swsbounce
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please swsbounce
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>
	</reply>

tests/data/test566+13 -13

@@ -8,18 +8,18 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 0
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 0
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	</data>
	</reply>

@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
	<file name="%LOGDIR/ip%TESTNUMBER">
	CL 0
	</file>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test567+7 -7

@@ -10,12 +10,12 @@ OPTIONS

	# Server-side
	<reply>
-	<data>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	CSeq: 1
-	Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE
-	Curl-Private: swsclose
+	<data crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	CSeq: 1
+	Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE
+	Curl-Private: swsclose
	</data>
	</reply>

@@ -37,7 +37,7 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
	CSeq: 1
	User-Agent: test%TESTNUMBER

tests/data/test568+17 -17

@@ -10,11 +10,11 @@ ANNOUNCE

	# Server-side
	<reply>
-	<data1>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	Cseq: 1
-
+	<data1 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	Cseq: 1
+
	</data1>

	<data2>
@@ -29,19 +29,19 @@ s=rtspd SDP
	i=A fake SDP reply
	u=http://www.curl.example.com/fakesdp.ps
	</data2>
-	<data3>
-	RTSP/1.0 200 Okie Dokie
-	Server: RTSPD/libcurl-test
-	Cseq: 3
-
+	<data3 crlf="headers">
+	RTSP/1.0 200 Okie Dokie
+	Server: RTSPD/libcurl-test
+	Cseq: 3
+
	</data3>
-	<data4>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	CSeq: 4
-	Curl-private: swsclose
-	Informational: Empty Options Response
-
+	<data4 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	CSeq: 4
+	Curl-private: swsclose
+	Informational: Empty Options Response
+
	</data4>
	</reply>

tests/data/test57+1 -1

@@ -35,7 +35,7 @@ HTTP content-type with spaces in
	<stdout mode="text">
	text/html; charset=ISO-8859-4
	</stdout>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test570+21 -21

@@ -10,29 +10,29 @@ Mismatch checking

	# Server-side
	<reply>
-	<data1>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	CSeq: 2
-	Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE
-	Informational: CSeq Mismatch
-
+	<data1 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	CSeq: 2
+	Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE
+	Informational: CSeq Mismatch
+
	</data1>
-	<data2>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	Session: asdf
-	CSeq: 999
-
+	<data2 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	Session: asdf
+	CSeq: 999
+
	</data2>
-	<data3>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	Session: asdfWRONG
-	Informational: Session ID mismatch
-	Curl-Private: swsclose
-	CSeq: 1000
-
+	<data3 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	Session: asdfWRONG
+	Informational: Session ID mismatch
+	Curl-Private: swsclose
+	CSeq: 1000
+
	</data3>

	</reply>

tests/data/test571+26 -26

@@ -14,39 +14,39 @@ RTP

	# Server-side
	<reply>
-	<data1>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	Session: asdf
-	CSeq: 1
-	Transport: RTP/AVP/TCP;unicast;interleaved=0-1
-
+	<data1 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	Session: asdf
+	CSeq: 1
+	Transport: RTP/AVP/TCP;unicast;interleaved=0-1
+
	</data1>

-	<data2>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	CSeq: 2
-	Session: asdf
-
+	<data2 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	CSeq: 2
+	Session: asdf
+
	</data2>

-	<data3>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	Cseq: 3
-	Content-Length: 4
-	Content-Type: fake/evil
-
+	<data3 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	Cseq: 3
+	Content-Length: 4
+	Content-Type: fake/evil
+
	$99
	</data3>

-	<data4>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	Session: asdf
-	CSeq: 4
-
+	<data4 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	Session: asdf
+	CSeq: 4
+
	</data4>

	<servercmd>

tests/data/test572+35 -35

@@ -10,53 +10,53 @@ GET_PARAMETER

	# Server-side
	<reply>
-	<data1>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	Session: getparams-test
-	CSeq: 1
-
+	<data1 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	Session: getparams-test
+	CSeq: 1
+
	</data1>

-	<data2>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	Session: getparams-test
-	Content-Type: text/parameters
-	Content-Length: 32
-	Cseq: 2
-
+	<data2 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	Session: getparams-test
+	Content-Type: text/parameters
+	Content-Length: 32
+	Cseq: 2
+
	scale=enormous
	speed=ludicrous

	</data2>

-	<data3>
-	RTSP/1.0 204 OK
-	Server: RTSPD/libcurl-test
-	Session: getparams-test
-	Cseq: 3
-
+	<data3 crlf="headers">
+	RTSP/1.0 204 OK
+	Server: RTSPD/libcurl-test
+	Session: getparams-test
+	Cseq: 3
+
	</data3>

-	<data4>
-	RTSP/1.0 200 Okie Dokie
-	Server: RTSPD/libcurl-test
-	Session: getparams-test
-	Cseq: 4
-	Content-Length: 37
-
+	<data4 crlf="headers">
+	RTSP/1.0 200 Okie Dokie
+	Server: RTSPD/libcurl-test
+	Session: getparams-test
+	Cseq: 4
+	Content-Length: 37
+
	packets_received: 1000
	jitter: 0.314
	</data4>
-	<data5>
-	RTSP/1.0 200 OK
-	Server: RTSPD/libcurl-test
-	Session: getparams-test
-	CSeq: 5
-	Curl-private: swsclose
-	Informational: Empty Options Response
-
+	<data5 crlf="headers">
+	RTSP/1.0 200 OK
+	Server: RTSPD/libcurl-test
+	Session: getparams-test
+	CSeq: 5
+	Curl-private: swsclose
+	Informational: Empty Options Response
+
	</data5>
	</reply>

tests/data/test573+13 -13

@@ -9,18 +9,18 @@ flaky
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

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

tests/data/test577+7 -7

@@ -10,12 +10,12 @@ OPTIONS

	# Server-side
	<reply>
-	<data>
-	RTSP/1.1234567 200 OK
-	Server: RTSPD/libcurl-test
-	CSeq: 1
-	Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE
-	Curl-Private: swsclose
+	<data crlf="headers">
+	RTSP/1.1234567 200 OK
+	Server: RTSPD/libcurl-test
+	CSeq: 1
+	Public: DESCRIBE, OPTIONS, SETUP, TEARDOWN, PLAY, PAUSE
+	Curl-Private: swsclose
	</data>
	<datacheck>
	</datacheck>
@@ -39,7 +39,7 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
	CSeq: 1
	User-Agent: test567

tests/data/test578+12 -12

@@ -8,18 +8,18 @@ HTTP POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	ETag: "21025-dc7-39462498"
-	Accept-Ranges: bytes
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-	Funny-head: yesyes
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
	-foo-
	</data>
	</reply>

tests/data/test579+35 -35

@@ -9,44 +9,44 @@ HTTP Digest auth
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please swsbounce
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please swsbounce
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
	</data>
-	<data1>
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</data1>
-	<datacheck>
-	HTTP/1.1 100 Continue
-	Server: Microsoft-IIS/5.0
-	Date: Sun, 03 Apr 2005 14:57:45 GMT
-	X-Powered-By: ASP.NET
-
-	HTTP/1.1 401 authentication please swsbounce
-	Server: Microsoft-IIS/6.0
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-
-	HTTP/1.1 200 A OK
-	Server: Microsoft-IIS/6.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 100 Continue
+	Server: Microsoft-IIS/5.0
+	Date: Sun, 03 Apr 2005 14:57:45 GMT
+	X-Powered-By: ASP.NET
+
+	HTTP/1.1 401 authentication please swsbounce
+	Server: Microsoft-IIS/6.0
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604144"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+
+	HTTP/1.1 200 A OK
+	Server: Microsoft-IIS/6.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 3
+
	ok
	</datacheck>
	</reply>

tests/data/test580+17 -17

@@ -10,23 +10,23 @@ Duplicate-header

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 eat this!
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: this-is-the-first.html
-	Content-Length: 0
-	Connection: close
-	Location: and there's a second one too! / moo.html
-
+	<data crlf="headers">
+	HTTP/1.1 302 eat this!
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: this-is-the-first.html
+	Content-Length: 0
+	Connection: close
+	Location: and there's a second one too! / moo.html
+
	</data>
-	<datacheck>
-	HTTP/1.1 302 eat this!
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: this-is-the-first.html
-	Content-Length: 0
-	Connection: close
+	<datacheck crlf="headers">
+	HTTP/1.1 302 eat this!
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: this-is-the-first.html
+	Content-Length: 0
+	Connection: close
	</datacheck>
	</reply>

@@ -53,7 +53,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

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

tests/data/test581+10 -10

@@ -10,15 +10,15 @@ Duplicate-header

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 all good!
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Content-Length: 0
-	Connection: close
-	Content-Type: changed/my/mind
-
+	<data crlf="headers">
+	HTTP/1.1 200 all good!
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Content-Length: 0
+	Connection: close
+	Content-Type: changed/my/mind
+
	</data>
	</reply>

@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

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

tests/data/test584+17 -17

@@ -10,26 +10,26 @@ HTTP MIME
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
	</datacheck>
	</reply>

tests/data/test585+9 -9

@@ -11,14 +11,14 @@ CURLOPT_CLOSESOCKETFUNCTION

	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 eat this!
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: this-is-the-first.html
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 302 eat this!
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: this-is-the-first.html
+	Content-Length: 0
+	Connection: close
+
	</data>
	<datacheck>
	[OPEN] counter: 1
@@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER

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

tests/data/test589+7 -7

@@ -10,12 +10,12 @@ HTTP MIME
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
	</data>
	</reply>
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	POST /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test59+1 -1

@@ -34,7 +34,7 @@ HTTP URL with slash but with "parameter"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /?mooo/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test590+37 -37

@@ -12,54 +12,54 @@ NTLM
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Negotiate
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Negotiate
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# this is returned first since we get no proxy-auth
-	<data1001>
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
+	<data1001 crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
	Hey you, authenticate or go away!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</data1002>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Proxy-Authenticate: Negotiate
-	Proxy-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 407 Authorization Required to proxy me my dear
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
-	HTTP/1.1 200 Things are fine in proxy land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Proxy-Authenticate: Negotiate
+	Proxy-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 407 Authorization Required to proxy me my dear
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
+	HTTP/1.1 200 Things are fine in proxy land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</datacheck>
	</reply>
@@ -90,7 +90,7 @@ http://test.remote.example.com/path/%TESTNUMBER http://%HOSTIP:%HTTPPORT
	# Verify data after the test has been "shot"
	<verify>

-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://test.remote.example.com/path/%TESTNUMBER HTTP/1.1
	Host: test.remote.example.com
	Accept: /

tests/data/test598+21 -21

@@ -12,31 +12,31 @@ curl_easy_reset
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	-foo-
	</data>

	# since the request runs twice
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	-foo-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	-foo-
	</datacheck>

@@ -66,7 +66,7 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: the-moo agent next generation

tests/data/test599+25 -25

@@ -9,15 +9,15 @@ chunked Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: %TESTNUMBER0001
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 302 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: %TESTNUMBER0001
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	-foo-
	</data>
	<data1>
@@ -35,22 +35,22 @@ this data is slightly larger than the first piece

	</data1>

-	<datacheck>
-	HTTP/1.1 302 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Location: %TESTNUMBER0001
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Transfer-Encoding: chunked
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 302 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Location: %TESTNUMBER0001
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Transfer-Encoding: chunked
+	Connection: close
+	Content-Type: text/html
+
	this data is slightly larger than the first piece
	</datacheck>

tests/data/test6+1 -1

@@ -38,7 +38,7 @@ cookies

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

tests/data/test60+5 -5

@@ -9,11 +9,11 @@ chunked Transfer-Encoding

	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+
	blablabla

	</data>

tests/data/test61+18 -18

@@ -11,26 +11,26 @@ httponly
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Type: text/html
-	Funny-head: yesyes
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Type: text/html
+	Funny-head: yesyes
	%if large-time
-	Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 13 11:56:27 GMT 2525
-	SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 13 11:56:27 GMT 2525
+	Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 13 11:56:27 GMT 2525
+	SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 13 11:56:27 GMT 2525
	%else
-	Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 13 11:56:27 GMT 2037
-	SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 13 11:56:27 GMT 2037
+	Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 13 11:56:27 GMT 2037
+	SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 13 11:56:27 GMT 2037
	%endif
-	Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure
-	Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure
-	Set-Cookie: test5=name; domain=anything.com; path=/ ; secure
-	Set-Cookie: fake=fooledyou; domain=..com; path=/;
-	Set-Cookie: supercookie=fooledyou; domain=.com; path=/;
-	Content-Length: 4
-
+	Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure
+	Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure
+	Set-Cookie: test5=name; domain=anything.com; path=/ ; secure
+	Set-Cookie: fake=fooledyou; domain=..com; path=/;
+	Set-Cookie: supercookie=fooledyou; domain=.com; path=/;
+	Content-Length: 4
+
	boo
	</data>
	</reply>
@@ -59,7 +59,7 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/%TESTNUMBER HTTP/1.1
	Host: www.host.foo.com
	User-Agent: curl/%VERSION

tests/data/test62+6 -6

@@ -11,11 +11,11 @@ httponly

	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Type: text/html
+
	boo
	</data>
	</reply>
@@ -49,7 +49,7 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/%TESTNUMBER HTTP/1.1
	Host: www.host.foo.com
	User-Agent: curl/%VERSION

tests/data/test63+6 -6

@@ -10,12 +10,12 @@ http_proxy
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Type: text/html
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Type: text/html
	Content-Length: 26
-
+
	the content would go here
	</data>
	</reply>
@@ -41,7 +41,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1
	Host: we.want.that.site.com
	Proxy-Authorization: Basic %b64[fake:user]b64%

tests/data/test64+26 -26

@@ -8,39 +8,39 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

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

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

tests/data/test643+20 -20

@@ -10,29 +10,29 @@ HTTP MIME POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test644+1 -1

@@ -65,7 +65,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -L -o %LOGDIR/out%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test645+20 -20

@@ -10,29 +10,29 @@ HTTP MIME POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test646+6 -6

@@ -23,11 +23,11 @@ smtp
	<name>
	SMTP multipart using mime API
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@%LOGDIR/headers%TESTNUMBER" -F "=)" -F "=@%LOGDIR/test%TESTNUMBER.txt;headers=<%LOGDIR/headers%TESTNUMBER" -H "From: different" -H "To: another" -H "Reply-To: <[email protected]>"
@@ -39,7 +39,7 @@ It may contain any type of data.
	</file1>
	<file2 name="%LOGDIR/headers%TESTNUMBER">
	# This line is a comment
-	X-fileheader1: This is a header from a file
+	X-fileheader1: This is a header from a file%spc%

	# This line is another comment. It precedes a folded header.
	X-fileheader2: This is #a

tests/data/test648+5 -5

@@ -23,11 +23,11 @@ smtp
	<name>
	SMTP multipart with transfer content encoders
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -F '=This is the email inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@%LOGDIR/test%TESTNUMBER.txt;encoder=base64" -H "From: different" -H "To: another"

tests/data/test649+5 -5

@@ -23,11 +23,11 @@ smtp
	<name>
	SMTP multipart with 7bit encoder error
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -F '=This is valid;encoder=7bit' -F "=@%LOGDIR/test%TESTNUMBER.txt;encoder=7bit" -H "From: different" -H "To: another"

tests/data/test65+28 -28

@@ -8,40 +8,40 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 401 Still a bad password you moron
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-
-	This is not the real page either
+	<data1000 crlf="yes">
+	HTTP/1.1 401 Still a bad password you moron
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+
+	This is not the real page either
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Still a bad password you moron
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-
-	This is not the real page either
+	<datacheck crlf="yes">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="2053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Still a bad password you moron
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+
+	This is not the real page either
	</datacheck>

	</reply>
@@ -66,7 +66,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:test2pass --digest

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

tests/data/test650+2 -2

@@ -10,7 +10,7 @@ FORM
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 301 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake swsclose
@@ -20,7 +20,7 @@ Location: /%TESTNUMBER0002

	hello
	</data>
-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test651+7 -7

@@ -10,13 +10,13 @@ FORM
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
	</reply>

tests/data/test653+20 -20

@@ -10,29 +10,29 @@ MIME
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test654+20 -20

@@ -10,29 +10,29 @@ HTTP MIME POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test655+7 -7

@@ -8,13 +8,13 @@ HTTP
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
	<datacheck>

tests/data/test658+1 -1

@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

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

tests/data/test659+1 -1

@@ -42,7 +42,7 @@ proxy
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://www.example.com/ HTTP/1.1
	Host: www.example.com
	Accept: /

tests/data/test66+1 -1

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

tests/data/test662+24 -24

@@ -10,32 +10,32 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 OK
-	Location: http://example.net/tes t case=/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 302 OK
+	Location: http://example.net/tes t case=/%TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 0
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 5
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 5
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 302 OK
-	Location: http://example.net/tes t case=/%TESTNUMBER0002
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 0
-
-	HTTP/1.1 200 OK
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 5
-
+	<datacheck crlf="headers">
+	HTTP/1.1 302 OK
+	Location: http://example.net/tes t case=/%TESTNUMBER0002
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 0
+
+	HTTP/1.1 200 OK
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 5
+
	body
	</datacheck>
	</reply>
@@ -60,7 +60,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://example.com/please/gimme/%TESTNUMBER HTTP/1.1
	Host: example.com
	User-Agent: curl/%VERSION

tests/data/test663+24 -24

@@ -14,32 +14,32 @@ followlocation
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 302 OK
-	Location: http://example.net/there/it/is/../../tes t case=/%TESTNUMBER0002? yes no
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 0
-
+	<data crlf="headers">
+	HTTP/1.1 302 OK
+	Location: http://example.net/there/it/is/../../tes t case=/%TESTNUMBER0002? yes no
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 0
+
	</data>
-	<data2>
-	HTTP/1.1 200 OK
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 5
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 5
+
	body
	</data2>
-	<datacheck>
-	HTTP/1.1 302 OK
-	Location: http://example.net/there/it/is/../../tes t case=/%TESTNUMBER0002? yes no
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 0
-
-	HTTP/1.1 200 OK
-	Location: this should be ignored
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 5
-
+	<datacheck crlf="headers">
+	HTTP/1.1 302 OK
+	Location: http://example.net/there/it/is/../../tes t case=/%TESTNUMBER0002? yes no
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 0
+
+	HTTP/1.1 200 OK
+	Location: this should be ignored
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 5
+
	body
	</datacheck>
	</reply>
@@ -64,7 +64,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://example.com/gimme/%TESTNUMBER?foobar HTTP/1.1
	Host: example.com
	User-Agent: curl/%VERSION

tests/data/test666+12 -12

@@ -11,20 +11,20 @@ MIME
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake
-	Content-Length: 3
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Content-Length: 3
+
	OK
	</datacheck>
	</reply>

tests/data/test667+14 -14

@@ -10,22 +10,22 @@ HTTP MIME POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test668+14 -14

@@ -10,22 +10,22 @@ HTTP MIME POST
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:4f:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:4f:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:4f:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:4f:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test67+26 -26

@@ -15,39 +15,39 @@ NTLM
	This is supposed to be returned when the server gets a first
	Authorization: NTLM line passed-in from the client -->

-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1002>

-	<datacheck>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -73,7 +73,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm

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

tests/data/test670+14 -14

@@ -10,22 +10,22 @@ MIME
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test671+14 -14

@@ -10,22 +10,22 @@ MIME
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test672+14 -14

@@ -10,22 +10,22 @@ FORM
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test673+14 -14

@@ -10,22 +10,22 @@ FORM
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</data>
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Server: test-server/fake swsclose
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake swsclose
+	Connection: close
+	Content-Type: text/html
+
	hello
	</datacheck>
	</reply>

tests/data/test674+1 -1

@@ -39,7 +39,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</client>

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

tests/data/test675+7 -7

@@ -8,12 +8,12 @@ HTTP Basic auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Thu, 09 Nov 2010 14:49:00 GMT
-	Content-Type: text/html
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Thu, 09 Nov 2010 14:49:00 GMT
+	Content-Type: text/html
+	Content-Length: 26
+
	the content would go here
	</data>
	</reply>
@@ -37,7 +37,7 @@ proxy

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /user1/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[user1:foo1]b64%

tests/data/test676+21 -21

@@ -12,31 +12,31 @@ curl_easy_reset
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	-foo-
	</data>

	# since the request runs twice
-	<datacheck>
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	<datacheck crlf="headers">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	-foo-
-	HTTP/1.1 200 OK
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Length: 6
-	Connection: close
-	Content-Type: text/html
-
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+
	-foo-
	</datacheck>

@@ -69,7 +69,7 @@ cookies
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: the-moo agent next generation

tests/data/test678+1 -1

@@ -48,7 +48,7 @@ https://localhost:%HTTPSPORT/%TESTNUMBER %CERTDIR/certs/test-ca.crt
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: localhost:%HTTPSPORT
	User-Agent: CURLOPT_CAINFO_BLOB

tests/data/test679+1 -1

@@ -44,7 +44,7 @@ machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET / HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[user1:with%20spaces%20and%20"%0a%0d%09a]b64%

tests/data/test68+28 -28

@@ -12,41 +12,41 @@ NTLM

	# This is supposed to be returned when the server gets a first
	# Authorization: NTLM line passed-in from the client
-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 401 You give me wrong password
-	Server: Microsoft-IIS/5.0
-	WWW-Authenticate: NTLM
-	Content-Length: 46
-	Content-Type: text/html; charset=iso-8859-1
-
+	<data1002 crlf="headers">
+	HTTP/1.1 401 You give me wrong password
+	Server: Microsoft-IIS/5.0
+	WWW-Authenticate: NTLM
+	Content-Length: 46
+	Content-Type: text/html; charset=iso-8859-1
+
	Wrong password dude. Get it fixed and return.
	</data1002>

-	<datacheck>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 401 You give me wrong password
-	Server: Microsoft-IIS/5.0
-	WWW-Authenticate: NTLM
-	Content-Length: 46
-	Content-Type: text/html; charset=iso-8859-1
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 401 You give me wrong password
+	Server: Microsoft-IIS/5.0
+	WWW-Authenticate: NTLM
+	Content-Length: 46
+	Content-Type: text/html; charset=iso-8859-1
+
	Wrong password dude. Get it fixed and return.
	</datacheck>

@@ -72,7 +72,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm

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

tests/data/test681+1 -1

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

tests/data/test682+1 -1

@@ -41,7 +41,7 @@ machine %HOSTIP login user2 password passwd2
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET / HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[user1:passwd1]b64%

tests/data/test683+1 -1

@@ -41,7 +41,7 @@ machine %HOSTIP login user2 password passwd2
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET / HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[user2:passwd2]b64%

tests/data/test684+1 -1

@@ -40,7 +40,7 @@ machine %HOSTIP password 5up3r53cr37
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET / HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[:5up3r53cr37]b64%

tests/data/test685+1 -1

@@ -40,7 +40,7 @@ machine %HOSTIP password 5up3r53cr37
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET / HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[user:5up3r53cr37]b64%

tests/data/test687+1 -1

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

tests/data/test688+1 -1

@@ -47,7 +47,7 @@ basic --xattr with -O
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test689+1 -1

@@ -37,7 +37,7 @@ rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
	</client>

	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	OPTIONS rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0
	CSeq: 1
	User-Agent: test567

tests/data/test69+43 -43

@@ -9,61 +9,61 @@ NTLM
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Basic
-	WWW-Authenticate: Wild-and-crazy
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Basic
+	WWW-Authenticate: Wild-and-crazy
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a first
	# Authorization: NTLM line passed-in from the client
-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1002>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Basic
-	WWW-Authenticate: Wild-and-crazy
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Basic
+	WWW-Authenticate: Wild-and-crazy
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -89,7 +89,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

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

tests/data/test690+3 -3

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -42,14 +42,14 @@ http://%HOSTIP:%HTTPPORT/ -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET / HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<file crlf="yes" name="%LOGDIR/curl_response">
+	<file name="%LOGDIR/curl_response" crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test691+3 -3

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -42,14 +42,14 @@ http://%HOSTIP:%HTTPPORT/path/to/here/ -O --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /path/to/here/ HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<file crlf="yes" name="%LOGDIR/here">
+	<file name="%LOGDIR/here" crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test692+3 -3

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -42,14 +42,14 @@ http://%HOSTIP:%HTTPPORT/ -JO --output-dir %LOGDIR
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET / HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION
	Accept: /

	</protocol>
-	<file crlf="yes" name="%LOGDIR/curl_response">
+	<file name="%LOGDIR/curl_response" crlf="headers">
	-foo-
	</file>
	</verify>

tests/data/test693+18 -18

@@ -9,24 +9,24 @@ etag
	#
	# Server-side
	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 funky chunky!
-	Server: fakeit/0.9 fakeitbad/1.0
-	Transfer-Encoding: chunked
-	Trailer: chunky-trailer
-	Connection: mooo
-	ETag: W/"asdf"
-
-	40
-	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-	30
-	bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-	21;heresatest=moooo
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 funky chunky!
+	Server: fakeit/0.9 fakeitbad/1.0
+	Transfer-Encoding: chunked
+	Trailer: chunky-trailer
+	Connection: mooo
+	ETag: W/"asdf"
+
+	40
+	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	30
+	bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	21;heresatest=moooo
	cccccccccccccccccccccccccccccccc
-
-	0
-	chunky-trailer: header data
-
+
+	0
+	chunky-trailer: header data
+
	</data>
	</reply>

@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/moo/boo/etag%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test694+46 -46

@@ -12,69 +12,69 @@ NTLM
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Negotiate
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Negotiate
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# this is returned first since we get no proxy-auth
-	<data1001>
-	HTTP/1.1 401 Authorization Required
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
	Hey you, authenticate or go away!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
	</data1002>

	# This is supposed to be returned when the server gets the second
	# request.
-	<data10>
-	HTTP/1.1 200 Things are fine
-	Content-Type: yeah/maybe
-	Content-Length: 42
-
+	<data10 crlf="headers">
+	HTTP/1.1 200 Things are fine
+	Content-Type: yeah/maybe
+	Content-Length: 42
+
	Contents of that second request. Differn.
	</data10>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Negotiate
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Authorization Required
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-	Content-Length: 34
-
-	HTTP/1.1 200 Things are fine
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 42
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Negotiate
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Authorization Required
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	Content-Length: 34
+
+	HTTP/1.1 200 Things are fine
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 42
+
	Contents of that page you requested, sir.
-	HTTP/1.1 200 Things are fine
-	Content-Type: yeah/maybe
-	Content-Length: 42
-
+	HTTP/1.1 200 Things are fine
+	Content-Type: yeah/maybe
+	Content-Length: 42
+
	Contents of that second request. Differn.
	</datacheck>
	</reply>
@@ -103,7 +103,7 @@ http://%HOSTIP:%HTTPPORT/path/mine http://%HOSTIP:%HTTPPORT/path/%TESTNUMBER0010
	# Verify data after the test has been "shot"
	<verify>

-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /path/mine HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Accept: /

tests/data/test696+21 -21

@@ -7,13 +7,13 @@ HTTP GET
	</info>

	<reply>
-	<data nocheck="yes">
-	HTTP/1.1 200 OK swsclose
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	Content-Length: 6
-	Connection: close
-
+	<data crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK swsclose
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	Content-Length: 6
+	Connection: close
+
	-foo-
	</data>
	</reply>
@@ -38,23 +38,23 @@ http://%HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<stdout>
-	HTTP/1.1 200 OK swsclose
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	Content-Length: 6
-	Connection: close
-
+	<stdout crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	Content-Length: 6
+	Connection: close
+
	-foo-
-	HTTP/1.1 200 OK swsclose
-	Server: test-server/fake
-	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-	Content-Length: 6
-	Connection: close
-
+	HTTP/1.1 200 OK swsclose
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	Content-Length: 6
+	Connection: close
+
	-foo-
	</stdout>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: ninja

tests/data/test699+2 -2

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[hej:you]b64%

tests/data/test7+1 -1

@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -D %LOGDIR/heads%TESTNUMBER

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

tests/data/test70+28 -28

@@ -9,41 +9,41 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

@@ -69,7 +69,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

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

tests/data/test700+1 -1

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

tests/data/test701+1 -1

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

tests/data/test708+1 -1

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

tests/data/test709+1 -1

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

tests/data/test710+1 -1

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

tests/data/test717+1 -1

@@ -55,7 +55,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:1
	User-Agent: curl/%VERSION

tests/data/test718+9 -9

@@ -14,16 +14,16 @@ HTTP proxy Digest auth
	<reply>

	# this is returned first since we get no proxy-auth
-	<connect>
-	HTTP/1.1 407 Authorization Required to proxy me swsclose
-	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
-
+	<connect crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me swsclose
+	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
+
	</connect>

-	<datacheck>
-	HTTP/1.1 407 Authorization Required to proxy me swsclose
-	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Authorization Required to proxy me swsclose
+	Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345"
+
	</datacheck>
	</reply>

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

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.remote.haxx.se.%TESTNUMBER:8990 HTTP/1.1
	Host: test.remote.haxx.se.%TESTNUMBER:8990
	User-Agent: curl/%VERSION

tests/data/test719+1 -1

@@ -49,7 +49,7 @@ http://[2200::33]:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: [2200::33]:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test72+28 -28

@@ -8,41 +8,41 @@ HTTP Digest auth
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Basic realm="foothis"
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Basic realm="foothis"
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Basic realm="foothis"
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 200 OK
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 23
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Basic realm="foothis"
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604199"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 200 OK
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 23
+
	This IS the real page!
	</datacheck>

@@ -68,7 +68,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

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

tests/data/test720+1 -1

@@ -48,7 +48,7 @@ http://12.34.56.78:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCKSPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: 12.34.56.78:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test721+1 -1

@@ -48,7 +48,7 @@ http://this.is.a.host.name:%HTTPPORT/%TESTNUMBER --proxy socks5h://%HOSTIP:%SOCK
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: this.is.a.host.name:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test722+1 -1

@@ -44,7 +44,7 @@ IPFS
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test724+1 -1

@@ -50,7 +50,7 @@ http://%HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test727+1 -1

@@ -44,7 +44,7 @@ IPNS
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /ipns/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test728+1 -1

@@ -44,7 +44,7 @@ SOCKS5h with HTTP redirect to hostname too long
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test73+8 -8

@@ -9,13 +9,13 @@ cookiejar
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 200 OK swsclose
-	Date: Tue, 09 Nov 2010 14:49:00 GMT
-	Content-Type: text/html
-	Set-Cookie: IPCZQX01af0fca5c=000010008168c200d25dfc4b; path=/; domain=.NOT_DISCLOSED.se
-	Content-Length: 4
-
+	<data crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Content-Type: text/html
+	Set-Cookie: IPCZQX01af0fca5c=000010008168c200d25dfc4b; path=/; domain=.NOT_DISCLOSED.se
+	Content-Length: 4
+
	boo
	</data>
	</reply>
@@ -38,7 +38,7 @@ cookies

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/%TESTNUMBER HTTP/1.1
	Host: host.NOT_DISCLOSED.se
	User-Agent: curl/%VERSION

tests/data/test730+1 -1

@@ -44,7 +44,7 @@ IPFS arg gateway with path
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /foo/bar/ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test731+1 -1

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

tests/data/test732+1 -1

@@ -44,7 +44,7 @@ IPFS with path
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test733+1 -1

@@ -44,7 +44,7 @@ IPFS with path and query args
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar&aaa=bbb HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test734+1 -1

@@ -44,7 +44,7 @@ IPFS with path, query args and gateway with path
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /some/path/ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u/a/b?foo=bar&aaa=bbb HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test735+1 -1

@@ -44,7 +44,7 @@ IPNS with path, query args and gateway with path
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /some/path/ipns/fancy.tld/a/b?foo=bar&aaa=bbb HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test736+1 -1

@@ -50,7 +50,7 @@ http://%HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test737+1 -1

@@ -50,7 +50,7 @@ http://%HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test74+1 -1

@@ -50,7 +50,7 @@ HTTP, urlglob {}-retrieval and -o #[num] usage
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test740+1 -1

@@ -52,7 +52,7 @@ bar
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /ipfs/bafybeidecnvkrygux6uoukouzps5ofkeevoqland7kopseiod6pzqvjg7u HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test742+1 -1

@@ -55,7 +55,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET / HTTP/1.1
	Host: %repeat[254 x c]%:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test743+1 -1

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test744+9 -9

@@ -20,9 +20,9 @@ Content-Length: 9

	contents
	</data>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+
	</connect>
	<datacheck>
	HTTP/1.1 200 Mighty fine indeed
@@ -62,13 +62,13 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT foo.host:%HTTPPORT HTTP/1.0
-	Host: foo.host:%HTTPPORT
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT foo.host:%HTTPPORT HTTP/1.0
+	Host: foo.host:%HTTPPORT
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: foo.host:%HTTPPORT
	Authorization: Basic %b64[foo:baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar]b64%

tests/data/test747+1 -1

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

tests/data/test749+6 -6

@@ -13,13 +13,13 @@ proxytunnel
	<reply>

	# this is returned first since we get no proxy-auth
-	<connect>
-	HTTP/1.1 400 Bad request
-	Connection: close
-
+	<connect crlf="headers">
+	HTTP/1.1 400 Bad request
+	Connection: close
+
	</connect>

-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 400 Bad request
	Connection: close

@@ -44,7 +44,7 @@ http://test.example --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -sS

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.example:80 HTTP/1.1
	Host: test.example:80
	User-Agent: curl/%VERSION

tests/data/test750+1 -1

@@ -40,7 +40,7 @@ http://test.example --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -sS

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.example:80 HTTP/1.1
	Host: test.example:80
	User-Agent: curl/%VERSION

tests/data/test752+3 -3

@@ -11,7 +11,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 404 nopes
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -26,7 +26,7 @@ Funny-head: yesyes
	-foo-
	</data>

-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 404 nopes
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -58,7 +58,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -f --retry 1
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test755+1 -1

@@ -47,7 +47,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://foo.host/%TESTNUMBER HTTP/1.1
	Host: foo.host
	Authorization: Basic %b64[foo:alone-in-the-dark]b64%

tests/data/test756+1 -1

@@ -47,7 +47,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/want/%TESTNUM

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

tests/data/test76+5 -5

@@ -9,7 +9,7 @@ NTLM
	</info>
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 401 Authorization Required swsclose
	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
	WWW-Authenticate: Basic, Wild-and-crazy, NTLM
@@ -21,7 +21,7 @@ This is not the real page

	# This is supposed to be returned when the server gets a first
	# Authorization: NTLM line passed-in from the client
-	<data1001 crlf="yes">
+	<data1001 crlf="headers">
	HTTP/1.1 401 Now gimme that second request of crap
	Server: Microsoft-IIS/5.0
	Content-Length: 34
@@ -33,7 +33,7 @@ This is not the real page either!

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002 crlf="yes">
+	<data1002 crlf="headers">
	HTTP/1.1 200 Things are fine in server land swsclose
	Server: Microsoft-IIS/5.0
	Content-Type: text/html; charset=iso-8859-1
@@ -42,7 +42,7 @@ Content-Length: 32
	Finally, this is the real page!
	</data1002>

-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 401 Authorization Required swsclose
	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
	WWW-Authenticate: Basic, Wild-and-crazy, NTLM
@@ -85,7 +85,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth

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

tests/data/test762+1 -1

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

tests/data/test767+2 -2

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test768+2 -2

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test769+2 -2

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test77+1 -1

@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 12:00:00 1999 GMT"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test770+2 -2

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test771+2 -2

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test772+2 -2

@@ -10,7 +10,7 @@ Location
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Content-Length: 0
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test773+2 -2

@@ -10,7 +10,7 @@ Location
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Content-Length: 0
@@ -38,7 +38,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test775+15 -15

@@ -11,23 +11,23 @@ NTLM

	# This is supposed to be returned when the server gets a first
	# Authorization: NTLM line passed-in from the client
-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

-	<datacheck>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	</datacheck>

	</reply>
@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser%repeat[1100 x A]%:testpass --nt

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

tests/data/test776+2 -2

@@ -10,7 +10,7 @@ flaky
	</info>

	<reply>
-	<data1001 crlf="yes" nocheck="yes">
+	<data1001 crlf="headers" nocheck="yes">
	HTTP/1.1 401 Authorization Required swsclose
	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAAAAAAAAAAABAIgAAQIDBAUGBwgAAAAAAAAAAP////8wAAAAAgD3/0F%repeat[21841 x BQUF]%BQUEAAAAA
	Content-Length: 0
@@ -37,7 +37,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u user:pass --ntlm

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

tests/data/test78+1 -1

@@ -54,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT"
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test780+4 -4

@@ -10,10 +10,10 @@ HSTS
	<reply>

	# we use this as response to a CONNECT
-	<connect nocheck="yes">
-	HTTP/1.1 200 OK
-	Server: fake
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Server: fake
+
	</connect>

	<data nocheck="yes">

tests/data/test781+4 -4

@@ -10,10 +10,10 @@ HSTS
	<reply>

	# we use this as response to a CONNECT
-	<connect nocheck="yes">
-	HTTP/1.1 200 OK
-	Server: fake
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Server: fake
+
	</connect>

	<data nocheck="yes">

tests/data/test782+4 -4

@@ -10,10 +10,10 @@ HSTS
	<reply>

	# we use this as response to a CONNECT
-	<connect nocheck="yes">
-	HTTP/1.1 200 OK
-	Server: fake
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Server: fake
+
	</connect>

	<data nocheck="yes">

tests/data/test783+4 -4

@@ -10,10 +10,10 @@ HSTS
	<reply>

	# we use this as response to a CONNECT
-	<connect nocheck="yes">
-	HTTP/1.1 200 OK
-	Server: fake
-
+	<connect crlf="headers" nocheck="yes">
+	HTTP/1.1 200 OK
+	Server: fake
+
	</connect>

	<data nocheck="yes">

tests/data/test784+1 -1

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test785+1 -1

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test786+1 -1

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test788+1 -1

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test789+2 -2

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -45,7 +45,7 @@ On the first Monday of the month of April, 1625, the market town of Meung
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	POST /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test79+1 -1

@@ -42,7 +42,7 @@ ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER -x %HOSTIP:%HTTPPORT
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET ftp://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test790+1 -1

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test791+1 -1

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test794+3 -3

@@ -8,7 +8,7 @@
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test796+3 -3

@@ -8,7 +8,7 @@
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 302 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test797+3 -3

@@ -8,7 +8,7 @@
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -23,7 +23,7 @@ Funny-head: yesyes

	-foo-
	</data>
-	<data1 crlf="yes">
+	<data1 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Connection: close
@@ -31,7 +31,7 @@ Content-Type: text/html

	-bar-
	</data1>
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	HTTP/1.1 308 OK
	Date: Thu, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake

tests/data/test799+8 -8

@@ -14,14 +14,14 @@ SASL AUTH +LOGIN
	AUTH PLAIN
	REPLY LOGIN A002 OK LOGIN completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test8+1 -1

@@ -88,7 +88,7 @@ cookies

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

tests/data/test80+10 -10

@@ -24,9 +24,9 @@ Content-Length: 9

	contents
	</data>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+
	</connect>
	<datacheck>
	HTTP/1.1 200 Mighty fine indeed
@@ -63,14 +63,14 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.0
-	Host: test.%TESTNUMBER:%HTTPPORT
-	Proxy-Authorization: Basic %b64[youare:yourself]b64%
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.0
+	Host: test.%TESTNUMBER:%HTTPPORT
+	Proxy-Authorization: Basic %b64[youare:yourself]b64%
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: test.%TESTNUMBER:%HTTPPORT
	Authorization: Basic %b64[iam:myself]b64%

tests/data/test800+8 -8

@@ -10,14 +10,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>

tests/data/test801+5 -5

@@ -10,11 +10,11 @@ FETCH
	#
	# Server-side
	<reply>
-	<data>
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test802+5 -5

@@ -11,11 +11,11 @@ UIDVALIDITY
	#
	# Server-side
	<reply>
-	<data>
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test804+5 -5

@@ -10,11 +10,11 @@ SELECT
	#
	# Server-side
	<reply>
-	<data>
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test805+10 -10

@@ -25,16 +25,16 @@ IMAP APPEND message
	<command>
	imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret
	</command>
-	<file name="%LOGDIR/upload%TESTNUMBER">
-	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?
+	<file name="%LOGDIR/upload%TESTNUMBER" 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?
	</file>
	</client>

tests/data/test806+4 -4

@@ -10,10 +10,10 @@ LIST
	#
	# Server-side
	<reply>
-	<data>
-	* LIST () "/" /%TESTNUMBER/blurdybloop
-	* LIST (\Noselect) "/" /%TESTNUMBER/foo
-	* LIST () "/" /%TESTNUMBER/foo/bar
+	<data crlf="yes">
+	* LIST () "/" /%TESTNUMBER/blurdybloop
+	* LIST (\Noselect) "/" /%TESTNUMBER/foo
+	* LIST () "/" /%TESTNUMBER/foo/bar
	</data>
	</reply>

tests/data/test807+4 -4

@@ -11,10 +11,10 @@ CUSTOMREQUEST
	#
	# Server-side
	<reply>
-	<data>
-	* LSUB () "/" /%TESTNUMBER/blurdybloop
-	* LSUB (\Noselect) "/" /%TESTNUMBER/foo
-	* LSUB () "/" /%TESTNUMBER/foo/bar
+	<data crlf="yes">
+	* LSUB () "/" /%TESTNUMBER/blurdybloop
+	* LSUB (\Noselect) "/" /%TESTNUMBER/foo
+	* LSUB () "/" /%TESTNUMBER/foo/bar
	</data>
	</reply>

tests/data/test808+8 -8

@@ -11,14 +11,14 @@ CUSTOMREQUEST
	#
	# Server-side
	<reply>
-	<data>
-	* 17 EXISTS
-	* 2 RECENT
-	* OK [UNSEEN 8] Message 8 is first unseen
-	* OK [UIDVALIDITY 3857529045] UIDs valid
-	* OK [UIDNEXT 4392] Predicted next UID
-	* FLAGS (\Answered \Flagged \Deleted \Seen \Draft)
-	* OK [PERMANENTFLAGS ()] No permanent flags permitted
+	<data crlf="yes">
+	* 17 EXISTS
+	* 2 RECENT
+	* OK [UNSEEN 8] Message 8 is first unseen
+	* OK [UIDVALIDITY 3857529045] UIDs valid
+	* OK [UIDNEXT 4392] Predicted next UID
+	* FLAGS (\Answered \Flagged \Deleted \Seen \Draft)
+	* OK [PERMANENTFLAGS ()] No permanent flags permitted
	</data>
	</reply>

tests/data/test809+2 -2

@@ -11,8 +11,8 @@ CUSTOMREQUEST
	#
	# Server-side
	<reply>
-	<data>
-	* STATUS %TESTNUMBER (MESSAGES 231 UIDNEXT 44292)
+	<data crlf="yes">
+	* STATUS %TESTNUMBER (MESSAGES 231 UIDNEXT 44292)
	</data>
	</reply>

tests/data/test81+26 -26

@@ -14,39 +14,39 @@ NTLM

	# This is supposed to be returned when the server gets a first
	# Authorization: NTLM line passed-in from the client
-	<data1001>
-	HTTP/1.1 407 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 407 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1002>

-	<datacheck>
-	HTTP/1.1 407 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<datacheck crlf="headers">
+	HTTP/1.1 407 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -73,7 +73,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%H

	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=

tests/data/test810+2 -2

@@ -10,8 +10,8 @@ SEARCH
	#
	# Server-side
	<reply>
-	<data>
-	* SEARCH 1 123 456 %TESTNUMBER
+	<data crlf="yes">
+	* SEARCH 1 123 456 %TESTNUMBER
	</data>
	</reply>

tests/data/test815+2 -2

@@ -12,8 +12,8 @@ CUSTOMREQUEST
	#
	# Server-side
	<reply>
-	<data1>
-	* 123 FETCH (FLAGS (\Seen \Deleted))
+	<data1 crlf="yes">
+	* 123 FETCH (FLAGS (\Seen \Deleted))
	</data1>
	</reply>

tests/data/test816+4 -4

@@ -12,11 +12,11 @@ CUSTOMREQUEST
	#
	# Server-side
	<reply>
-	<data1>
-	* 123 FETCH (FLAGS (\Seen \Deleted))
+	<data1 crlf="yes">
+	* 123 FETCH (FLAGS (\Seen \Deleted))
	</data1>
-	<data2>
-	* 123 EXPUNGE
+	<data2 crlf="yes">
+	* 123 EXPUNGE
	</data2>
	</reply>

tests/data/test818+5 -5

@@ -11,11 +11,11 @@ CUSTOMREQUEST
	#
	# Server-side
	<reply>
-	<data>
-	* 22 EXPUNGE
-	* 23 EXISTS
-	* 3 RECENT
-	* 14 FETCH (FLAGS (\Seen \Deleted))
+	<data crlf="yes">
+	* 22 EXPUNGE
+	* 23 EXISTS
+	* 3 RECENT
+	* 14 FETCH (FLAGS (\Seen \Deleted))
	</data>
	</reply>

tests/data/test819+8 -8

@@ -16,14 +16,14 @@ AUTH PLAIN
	REPLY AUTHENTICATE +
	REPLY AHVzZXIAc2VjcmV0 A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test82+7 -7

@@ -11,13 +11,13 @@ HTTP proxy NTLM auth
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 407 We only deal with NTLM my friend
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
+	<data crlf="headers">
+	HTTP/1.1 407 We only deal with NTLM my friend
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
	Proxy-Authenticate: NTLM
-
+
	This is not the real page either!
	</data>

@@ -41,7 +41,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%H

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

tests/data/test820+8 -8

@@ -16,14 +16,14 @@ REPLY AUTHENTICATE + VXNlcm5hbWU6
	REPLY dXNlcg== + UGFzc3dvcmQ6
	REPLY c2VjcmV0 A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test821+8 -8

@@ -16,14 +16,14 @@ AUTH CRAM-MD5
	REPLY AUTHENTICATE + PDE5NzIuOTg3NjU0MzIxQGN1cmw+
	REPLY dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg== A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test822+8 -8

@@ -17,14 +17,14 @@ REPLY AUTHENTICATE +
	REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= + TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
	REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04= A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test823+8 -8

@@ -17,14 +17,14 @@ REPLY AUTHENTICATE + cmVhbG09ImN1cmwiLG5vbmNlPSI1MzAwZDE3YTFkNjk1YmQ0MTFlNGNkZjk
	REPLY dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJpbWFwLzEyNy4wLjAuMSIscmVzcG9uc2U9YmU2MzgyNDkzNjJkN2FhMGUzNTM4NTA3Njc1MWFiNDgscW9wPWF1dGg= + cnNwYXV0aD04MWY5MDNlYjQ4MjNhZTkyMmRiNWYwNGNiNThjY2RlYg==
	REPLY A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test824+8 -8

@@ -16,14 +16,14 @@ AUTH XOAUTH2
	REPLY AUTHENTICATE +
	REPLY dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test825+8 -8

@@ -17,14 +17,14 @@ AUTH PLAIN
	CAPA SASL-IR
	REPLY AUTHENTICATE A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test826+8 -8

@@ -17,14 +17,14 @@ CAPA SASL-IR
	REPLY AUTHENTICATE + UGFzc3dvcmQ6
	REPLY c2VjcmV0 A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test827+8 -8

@@ -18,14 +18,14 @@ CAPA SASL-IR
	REPLY AUTHENTICATE + TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
	REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04= A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test828+8 -8

@@ -17,14 +17,14 @@ AUTH XOAUTH2
	CAPA SASL-IR
	REPLY AUTHENTICATE A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test83+10 -10

@@ -21,9 +21,9 @@ Content-Length: 9

	contents
	</data>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+
	</connect>
	<datacheck>
	HTTP/1.1 200 Mighty fine indeed
@@ -60,14 +60,14 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: test.%TESTNUMBER:%HTTPPORT
	Authorization: Basic %b64[iam:my:;self]b64%

tests/data/test833+8 -8

@@ -20,14 +20,14 @@ REPLY * A002 NO AUTH exchange cancelled by client
	REPLY "AUTHENTICATE PLAIN" +
	REPLY AHVzZXIAc2VjcmV0 A003 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test834+8 -8

@@ -20,14 +20,14 @@ REPLY * A002 NO AUTH exchange cancelled by client
	REPLY "AUTHENTICATE PLAIN" +
	REPLY AHVzZXIAc2VjcmV0 A003 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test835+8 -8

@@ -20,14 +20,14 @@ REPLY * A002 NO AUTH exchange cancelled by client
	REPLY "AUTHENTICATE PLAIN" +
	REPLY AHVzZXIAc2VjcmV0 A003 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test836+10 -10

@@ -12,17 +12,17 @@ connection reuse
	# Server-side
	<reply>
	<servercmd>
-	REPLY "LOGIN user.one secret" A002 OK LOGIN completed
-	REPLY "LOGIN user.two secret" B002 OK LOGIN completed
+	REPLY "LOGIN user.one secret" A002 OK LOGIN completed
+	REPLY "LOGIN user.two secret" B002 OK LOGIN completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test837+8 -8

@@ -16,14 +16,14 @@ AUTH EXTERNAL
	REPLY AUTHENTICATE +
	REPLY dXNlcg== A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test838+8 -8

@@ -16,14 +16,14 @@ AUTH EXTERNAL
	REPLY AUTHENTICATE +
	REPLY = A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test839+8 -8

@@ -17,14 +17,14 @@ AUTH EXTERNAL
	CAPA SASL-IR
	REPLY AUTHENTICATE A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test84+1 -1

@@ -41,7 +41,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[iam:myself]b64%

tests/data/test840+8 -8

@@ -17,14 +17,14 @@ AUTH EXTERNAL
	CAPA SASL-IR
	REPLY AUTHENTICATE A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test841+13 -13

@@ -11,20 +11,20 @@ CUSTOMREQUEST
	#
	# Server-side
	<reply>
-	<data>
-	body
-
-	+ Curl did not used to like this line
-	--
-	yours sincerely
+	<data crlf="yes">
+	body
+
+	+ Curl did not used to like this line
+	--
+	yours sincerely
	</data>
-	<datacheck>
-	* 123 FETCH (BODY[1] {70}
-	body
-
-	+ Curl did not used to like this line
-	--
-	yours sincerely
+	<datacheck crlf="yes">
+	* 123 FETCH (BODY[1] {70}
+	body
+
+	+ Curl did not used to like this line
+	--
+	yours sincerely
	</datacheck>
	</reply>

tests/data/test842+8 -8

@@ -17,14 +17,14 @@ AUTH OAUTHBEARER
	REPLY AUTHENTICATE +
	REPLY %b64[n,a=user,%01host=127.0.0.1%01port=%IMAPPORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64% A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test843+8 -8

@@ -18,14 +18,14 @@ AUTH OAUTHBEARER
	CAPA SASL-IR
	REPLY AUTHENTICATE A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test846+8 -8

@@ -12,14 +12,14 @@ IMAP
	REPLY welcome * PREAUTH ready to serve already!
	REPLY CAPABILITY * CAPABILITY IMAP4REV1 I18NLEVEL=1 LITERAL+ IDLE UIDPLUS NAMESPACE CHILDREN MAILBOX-REFERRALS BINARY UNSELECT ESEARCH WITHIN SCAN SORT THREAD=REFERENCES THREAD=ORDEREDSUBJECT MULTIAPPEND SASL-IR LOGIN-REFERRALS STARTTLS LOGINDISABLED\r\nA001 OK CAPABILITY completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test847+8 -8

@@ -10,14 +10,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>

tests/data/test848+8 -8

@@ -16,14 +16,14 @@ AUTH PLAIN
	REPLY AUTHENTICATE +
	REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= A002 OK AUTHENTICATE completed
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test85+1 -1

@@ -44,7 +44,7 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Proxy-Authorization: Basic %b64[testing:this]b64%

tests/data/test850+8 -8

@@ -10,14 +10,14 @@ RETR
	#
	# 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>

tests/data/test853+4 -4

@@ -18,10 +18,10 @@ SLOWDOWN
	</servercmd>
	# When doing LIST, we get the default list output hard-coded in the test
	# POP3 server
-	<data>
-	1 100
-	2 4294967400
-	3 200
+	<data crlf="yes">
+	1 100
+	2 4294967400
+	3 200
	</data>
	</reply>

tests/data/test857+18 -18

@@ -10,25 +10,25 @@ RETR
	#
	# Server-side
	<reply>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	..body with a single dot first
-	...triple dots...
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	..body with a single dot first
+	...triple dots...
+
+	--
+	yours sincerely
	</data>
-	<datacheck>
-	From: me@somewhere
-	To: fake@nowhere
-
-	.body with a single dot first
-	..triple dots...
-
-	--
-	yours sincerely
+	<datacheck crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	.body with a single dot first
+	..triple dots...
+
+	--
+	yours sincerely
	</datacheck>
	</reply>

tests/data/test86+1 -1

@@ -64,7 +64,7 @@ HTTP, urlglob []-retrieval and -o #[num] usage
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER0001 HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test861+7 -7

@@ -13,14 +13,14 @@ RFC2449
	# Server-side
	<reply>
	<servercmd>
-	CAPA UIDL USER
+	CAPA UIDL USER
	</servercmd>
-	# When doing UIDL, we get the default list output hard-coded in the test
-	# POP3 server
-	<datacheck>
-	1 1
-	2 2
-	3 4
+	# When doing UIDL, we get the default list output hard-coded in the test
+	# POP3 server
+	<datacheck crlf="yes">
+	1 1
+	2 2
+	3 4
	</datacheck>
	</reply>

tests/data/test862+5 -5

@@ -13,12 +13,12 @@ RFC2449
	# Server-side
	<reply>
	<servercmd>
-	CAPA TOP USER
+	CAPA TOP USER
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
	</data>
	</reply>

tests/data/test864+8 -8

@@ -13,14 +13,14 @@ APOP
	CAPA APOP
	REPLY welcome +OK curl POP3 server ready to serve <1972.987654321\@curl>
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test865+8 -8

@@ -18,14 +18,14 @@ AUTH PLAIN
	REPLY AUTH +
	REPLY AHVzZXIAc2VjcmV0 +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test866+8 -8

@@ -18,14 +18,14 @@ REPLY AUTH + VXNlcm5hbWU6
	REPLY dXNlcg== + UGFzc3dvcmQ6
	REPLY c2VjcmV0 +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test867+8 -8

@@ -18,14 +18,14 @@ AUTH CRAM-MD5
	REPLY AUTH + PDE5NzIuOTg3NjU0MzIxQGN1cmw+
	REPLY dXNlciA3MDMxNzI1NTk5ZmRiYjVkNDEyNjg5YWEzMjNlM2UwYg== +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test868+9 -9

@@ -16,17 +16,17 @@ NTLM
	<servercmd>
	AUTH NTLM
	REPLY AUTH +
-	REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= + TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= + TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
	REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04= +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test869+8 -8

@@ -19,14 +19,14 @@ REPLY AUTH + cmVhbG09ImN1cmwiLG5vbmNlPSI1MzAwZDE3YTFkNjk1YmQ0MTFlNGNkZjk2Zjk1NDh
	REPLY dXNlcm5hbWU9InVzZXIiLHJlYWxtPSJjdXJsIixub25jZT0iNTMwMGQxN2ExZDY5NWJkNDExZTRjZGY5NmY5NTQ4YzIzY2VkNjE3NSIsY25vbmNlPSIzNDMzMzIzMTM1MzMzMjMxMzYzMzMyMzEzNzMzMzIzMSIsbmM9IjAwMDAwMDAxIixkaWdlc3QtdXJpPSJwb3AvMTI3LjAuMC4xIixyZXNwb25zZT0xODMxNTU0OGM3ZjNhMzdlNzE2ZmE4ZTkwZGZhYjliNixxb3A9YXV0aA== + cnNwYXV0aD1mZWNiMzZiNzA4NmUwYjk1ZDkwNjQ1OWVmYThjYzI5ZQ==
	REPLY +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test87+15 -15

@@ -11,18 +11,18 @@ FAILURE
	#
	# Server-side
	<reply>
-	<data1>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 15
-
+	<data1 crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 15
+
	the number one
	</data1>
-	<data2>
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 16
-
+	<data2 crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 16
+
	two is nice too
	</data2>

@@ -50,11 +50,11 @@ urlglob with out of range -o #[num] usage
	# survives
	#
	<verify>
-	<file name="%LOGDIR/dumpit%TESTNUMBER-#2.dump">
-	HTTP/1.1 200 OK
-	Funny-head: yesyes
-	Content-Length: 16
-
+	<file name="%LOGDIR/dumpit%TESTNUMBER-#2.dump" crlf="headers">
+	HTTP/1.1 200 OK
+	Funny-head: yesyes
+	Content-Length: 16
+
	two is nice too
	</file>
	</verify>

tests/data/test870+8 -8

@@ -18,14 +18,14 @@ AUTH XOAUTH2
	REPLY AUTH +
	REPLY dXNlcj11c2VyAWF1dGg9QmVhcmVyIG1GXzkuQjVmLTQuMUpxTQEB +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test871+8 -8

@@ -18,14 +18,14 @@ RFC5034
	AUTH PLAIN
	REPLY AUTH +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test872+8 -8

@@ -18,14 +18,14 @@ AUTH LOGIN
	REPLY AUTH + UGFzc3dvcmQ6
	REPLY c2VjcmV0 +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test873+8 -8

@@ -19,14 +19,14 @@ AUTH NTLM
	REPLY AUTH + TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
	REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04= +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test874+8 -8

@@ -18,14 +18,14 @@ RFC6749
	AUTH XOAUTH2
	REPLY AUTH +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test879+8 -8

@@ -22,14 +22,14 @@ REPLY * -ERR AUTH exchange cancelled by client
	REPLY "AUTH PLAIN" +
	REPLY AHVzZXIAc2VjcmV0 +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test88+25 -25

@@ -12,39 +12,39 @@ HTTP Digest auth
	<servercmd>
	auth_required
	</servercmd>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a
	# Authorization: Digest line passed-in from the client
-	<data1000>
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<data1000 crlf="headers">
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This IS the real page!
	</data1000>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
-	HTTP/1.1 200 OK swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	Content-Type: text/html; charset=iso-8859-1
-	Connection: close
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
+	HTTP/1.1 200 OK swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	Content-Type: text/html; charset=iso-8859-1
+	Connection: close
+
	This IS the real page!
	</datacheck>

tests/data/test880+8 -8

@@ -22,14 +22,14 @@ REPLY * -ERR AUTH exchange cancelled by client
	REPLY "AUTH PLAIN" +
	REPLY AHVzZXIAc2VjcmV0 +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test881+8 -8

@@ -22,14 +22,14 @@ REPLY * -ERR AUTH exchange cancelled by client
	REPLY "AUTH PLAIN" +
	REPLY AHVzZXIAc2VjcmV0 +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test882+9 -9

@@ -12,16 +12,16 @@ connection reuse
	# Server-side
	<reply>
	<servercmd>
-	REPLY "PASS secret" +OK Login successful
+	REPLY "PASS secret" +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test883+8 -8

@@ -18,14 +18,14 @@ AUTH EXTERNAL
	REPLY AUTH +
	REPLY dXNlcg== +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test884+8 -8

@@ -18,14 +18,14 @@ AUTH EXTERNAL
	REPLY AUTH +
	REPLY = +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test885+8 -8

@@ -18,14 +18,14 @@ RFC5034
	AUTH EXTERNAL
	REPLY AUTH +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test886+8 -8

@@ -18,14 +18,14 @@ RFC5034
	AUTH EXTERNAL
	REPLY AUTH +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test887+8 -8

@@ -19,14 +19,14 @@ AUTH OAUTHBEARER
	REPLY AUTH +
	REPLY %b64[n,a=user,%01host=127.0.0.1%01port=%POP3PORT%01auth=Bearer mF_9.B5f-4.1JqM%01%01]b64% +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test888+8 -8

@@ -19,14 +19,14 @@ RFC7628
	AUTH OAUTHBEARER
	REPLY AUTH +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test89+50 -50

@@ -16,71 +16,71 @@ NTLM
	This is supposed to be returned when the server gets a first
	Authorization: NTLM line passed-in from the client -->

-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 301 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Connection: close
-	Location: /you/%TESTNUMBER0010
-
+	<data1002 crlf="headers">
+	HTTP/1.1 301 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Connection: close
+	Location: /you/%TESTNUMBER0010
+
	</data1002>

	# This is the first reply after the redirection
-	<data1011>
-	HTTP/1.1 401 Now gimme that second round of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1011 crlf="headers">
+	HTTP/1.1 401 Now gimme that second round of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1011>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1012>
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1012 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1012>

-	<datacheck>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 301 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Connection: close
-	Location: /you/%TESTNUMBER0010
-
-	HTTP/1.1 401 Now gimme that second round of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 301 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Connection: close
+	Location: /you/%TESTNUMBER0010
+
+	HTTP/1.1 401 Now gimme that second round of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -106,7 +106,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --ntlm -L

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

tests/data/test892+8 -8

@@ -18,14 +18,14 @@ AUTH PLAIN
	REPLY AUTH +
	REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= +OK Login successful
	</servercmd>
-	<data>
-	From: me@somewhere
-	To: fake@nowhere
-
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	From: me@somewhere
+	To: fake@nowhere
+
+	body
+
+	--
+	yours sincerely
	</data>
	</reply>

tests/data/test895+8 -8

@@ -11,14 +11,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>

tests/data/test897+25 -25

@@ -10,11 +10,11 @@ FETCH
	#
	# Server-side
	<reply>
-	<data>
-	body
-
-	--
-	yours sincerely
+	<data crlf="yes">
+	body
+
+	--
+	yours sincerely
	</data>
	<servercmd>
	POSTFETCH extra stuff sent in the envelope after the body
@@ -45,26 +45,26 @@ A003 SELECT %TESTNUMBER
	A004 FETCH 123 BODY[1]
	A005 LOGOUT
	</protocol>
-	<file name="%LOGDIR/head-%TESTNUMBER">
-	_ _ ____ _
-	___\| \| \| \| _ \\| \|
-	/ __\| \| \| \| \|_) \| \|
-	\| (__\| \|_\| \| _ {\| \|___
-	\___\|\___/\|_\| \_\_____\|
-	* OK curl IMAP server ready to serve
-	A001 BAD Command
-	A002 OK LOGIN completed
-	* 172 EXISTS
-	* 1 RECENT
-	* OK [UNSEEN 12] Message 12 is first unseen
-	* OK [UIDVALIDITY 3857529045] UIDs valid
-	* OK [UIDNEXT 4392] Predicted next UID
-	* FLAGS (\Answered \Flagged \Deleted \Seen \Draft)
-	* OK [PERMANENTFLAGS (\Deleted \Seen \*)] Limited
-	A003 OK [READ-WRITE] SELECT completed
-	* 123 FETCH (BODY[1] {31}
-	extra stuff sent in the envelope after the body)
-	A004 OK FETCH completed
+	<file name="%LOGDIR/head-%TESTNUMBER" crlf="yes">
+	_ _ ____ _%spc%%spc%%spc%%spc%%spc%
+	___\| \| \| \| _ \\| \|%spc%%spc%%spc%%spc%
+	/ __\| \| \| \| \|_) \| \|%spc%%spc%%spc%%spc%
+	\| (__\| \|_\| \| _ {\| \|___%spc%
+	\___\|\___/\|_\| \_\_____\|
+	* OK curl IMAP server ready to serve
+	A001 BAD Command
+	A002 OK LOGIN completed
+	* 172 EXISTS
+	* 1 RECENT
+	* OK [UNSEEN 12] Message 12 is first unseen
+	* OK [UIDVALIDITY 3857529045] UIDs valid
+	* OK [UIDNEXT 4392] Predicted next UID
+	* FLAGS (\Answered \Flagged \Deleted \Seen \Draft)
+	* OK [PERMANENTFLAGS (\Deleted \Seen \*)] Limited
+	A003 OK [READ-WRITE] SELECT completed
+	* 123 FETCH (BODY[1] {31}
+	extra stuff sent in the envelope after the body)
+	A004 OK FETCH completed
	</file>
	</verify>
	</testcase>

tests/data/test898+1 -1

@@ -74,7 +74,7 @@ HTTP with custom auth and cookies redirected to HTTP on a diff port
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://firsthost.com/ HTTP/1.1
	Host: firsthost.com
	User-Agent: curl/%VERSION

tests/data/test899+3 -3

@@ -10,7 +10,7 @@ HTTP Basic auth
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 302 go go go
	Content-Length: 8
	Location: http://user:pass@%HOSTIP:%HTTPPORT/basic-auth/user/%TESTNUMBER0002
@@ -19,7 +19,7 @@ Funny-head: yesyes

	notreal
	</data>
-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Content-Type: text/html
@@ -46,7 +46,7 @@ http://first:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER -L
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[first:secret]b64%

tests/data/test90+84 -84

@@ -12,113 +12,113 @@ NTLM
	# Server-side
	<reply>

-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Basic
-	WWW-Authenticate: Wild-and-crazy
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Basic
+	WWW-Authenticate: Wild-and-crazy
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data>

	# This is supposed to be returned when the server gets a first
	# Authorization: NTLM line passed-in from the client
-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 301 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Connection: close
-	Location: /you/%TESTNUMBER0010
-
+	<data1002 crlf="headers">
+	HTTP/1.1 301 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Connection: close
+	Location: /you/%TESTNUMBER0010
+
	</data1002>

	# This is the first reply after the redirection
-	<data10>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Basic
-	WWW-Authenticate: Wild-and-crazy
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
+	<data10 crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Basic
+	WWW-Authenticate: Wild-and-crazy
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
	This is not the real page
	</data10>

-	<data1011>
-	HTTP/1.1 401 Now gimme that second round of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1011 crlf="headers">
+	HTTP/1.1 401 Now gimme that second round of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1011>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1012>
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1012 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1012>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Basic
-	WWW-Authenticate: Wild-and-crazy
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 301 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Connection: close
-	Location: /you/%TESTNUMBER0010
-
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Basic
-	WWW-Authenticate: Wild-and-crazy
-	WWW-Authenticate: NTLM
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 26
-
-	HTTP/1.1 401 Now gimme that second round of crap
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 34
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Basic
+	WWW-Authenticate: Wild-and-crazy
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 301 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Connection: close
+	Location: /you/%TESTNUMBER0010
+
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Basic
+	WWW-Authenticate: Wild-and-crazy
+	WWW-Authenticate: NTLM
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 26
+
+	HTTP/1.1 401 Now gimme that second round of crap
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 34
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -144,7 +144,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u testuser:testpass --anyauth -L

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

tests/data/test901+11 -11

@@ -19,17 +19,17 @@ smtp
	<name>
	SMTP with CRLF-dot-CRLF in data
	</name>
-	<stdin>
-	From: different
-	To: another
-
-
-	.
-	.
-
-	.
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+
+	.
+	.
+
+	.
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test902+5 -5

@@ -24,11 +24,11 @@ smtp
	<name>
	RFC821-only SMTP server (EHLO not supported)
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test903+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP plain authentication
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret -T -

tests/data/test904+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP login authentication
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret -T -

tests/data/test905+2 -2

@@ -32,8 +32,8 @@ digest
	<name>
	SMTP CRAM-MD5 authentication
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret -T -

tests/data/test906+3 -3

@@ -15,7 +15,7 @@ NTLM
	<servercmd>
	AUTH NTLM
	REPLY AUTH 334 NTLM supported
-	REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= 334 TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	REPLY TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA= 334 TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
	REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04= 235 Authenticated
	</servercmd>
	</reply>
@@ -34,8 +34,8 @@ SSL
	<name>
	SMTP NTLM authentication
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u testuser:testpass -T -

tests/data/test907+2 -2

@@ -38,8 +38,8 @@ CURL_ENTROPY=12345678
	<name>
	SMTP DIGEST-MD5 authentication
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret -T -

tests/data/test908+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP OAuth 2.0 (XOAUTH2) authentication
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -

tests/data/test909+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP without SIZE support
	</name>
-	<file name="%LOGDIR/test%TESTNUMBER.eml">
-	From: different
-	To: another
-
-	body
+	<file name="%LOGDIR/test%TESTNUMBER.eml" crlf="yes">
+	From: different
+	To: another
+
+	body
	</file>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -T %LOGDIR/test%TESTNUMBER.eml

tests/data/test91+45 -45

@@ -9,62 +9,62 @@ NTLM
	</info>
	# Server-side
	<reply>
-	<data>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Magic-Negotiate
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="daniel"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-	Connection: close
-
+	<data crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Magic-Negotiate
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="daniel"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+	Connection: close
+
	</data>

	# This is supposed to be returned when the server gets a first
	# Authorization: NTLM line passed-in from the client
-	<data1001>
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
+	<data1001 crlf="headers">
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
	This is not the real page either!
	</data1001>

	# This is supposed to be returned when the server gets the second
	# Authorization: NTLM line passed-in from the client
-	<data1002>
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<data1002 crlf="headers">
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</data1002>

-	<datacheck>
-	HTTP/1.1 401 Authorization Required swsclose
-	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
-	WWW-Authenticate: Magic-Negotiate
-	WWW-Authenticate: NTLM
-	WWW-Authenticate: Basic realm="daniel"
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 0
-	Connection: close
-
-	HTTP/1.1 401 Now gimme that second request of crap
-	Server: Microsoft-IIS/5.0
-	Content-Length: 34
-	Content-Type: text/html; charset=iso-8859-1
-	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
-
-	HTTP/1.1 200 Things are fine in server land swsclose
-	Server: Microsoft-IIS/5.0
-	Content-Type: text/html; charset=iso-8859-1
-	Content-Length: 32
-
+	<datacheck crlf="headers">
+	HTTP/1.1 401 Authorization Required swsclose
+	Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+	WWW-Authenticate: Magic-Negotiate
+	WWW-Authenticate: NTLM
+	WWW-Authenticate: Basic realm="daniel"
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 0
+	Connection: close
+
+	HTTP/1.1 401 Now gimme that second request of crap
+	Server: Microsoft-IIS/5.0
+	Content-Length: 34
+	Content-Type: text/html; charset=iso-8859-1
+	WWW-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+
+	HTTP/1.1 200 Things are fine in server land swsclose
+	Server: Microsoft-IIS/5.0
+	Content-Type: text/html; charset=iso-8859-1
+	Content-Length: 32
+
	Finally, this is the real page!
	</datacheck>

@@ -90,7 +90,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --anyauth -u mydomain\\myself:secret

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

tests/data/test910+4 -4

@@ -19,10 +19,10 @@ smtp
	<name>
	SMTP without terminating CRLF
	</name>
-	<stdin nonewline="yes">
-	From: different
-	To: another
-
+	<stdin crlf="headers" nonewline="yes">
+	From: different
+	To: another
+
	body
	</stdin>
	<command>

tests/data/test912+5 -5

@@ -23,11 +23,11 @@ smtp
	<name>
	SMTP with SIZE support
	</name>
-	<file name="%LOGDIR/test%TESTNUMBER.eml">
-	From: different
-	To: another
-
-	body
+	<file name="%LOGDIR/test%TESTNUMBER.eml" crlf="yes">
+	From: different
+	To: another
+
+	body
	</file>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -T %LOGDIR/test%TESTNUMBER.eml

tests/data/test913+5 -5

@@ -23,11 +23,11 @@ smtp
	<name>
	SMTP with large message SIZE
	</name>
-	<file name="%LOGDIR/test%TESTNUMBER.eml">
-	From: different
-	To: another
-
-	body
+	<file name="%LOGDIR/test%TESTNUMBER.eml" crlf="yes">
+	From: different
+	To: another
+
+	body
	</file>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -T %LOGDIR/test%TESTNUMBER.eml

tests/data/test914+5 -5

@@ -22,11 +22,11 @@ smtp
	<name>
	SMTP invalid --mail-from
	</name>
-	<file name="%LOGDIR/test%TESTNUMBER.eml">
-	From: different
-	To: another
-
-	body
+	<file name="%LOGDIR/test%TESTNUMBER.eml" crlf="yes">
+	From: different
+	To: another
+
+	body
	</file>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from invalid -T %LOGDIR/test%TESTNUMBER.eml

tests/data/test915+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP without --mail-from
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] -T -

tests/data/test916+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP with invalid --mail-rcpt
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt invalid --mail-from [email protected] -T -

tests/data/test917+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP with multiple --mail-rcpt
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test918+5 -5

@@ -19,11 +19,11 @@ smtp
	<name>
	SMTP with multiple and invalid --mail-rcpt
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-rcpt invalid --mail-rcpt [email protected] --mail-rcpt sTrAnGe --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test919+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP plain authentication with initial response
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret --sasl-ir -T -

tests/data/test92+3 -3

@@ -10,7 +10,7 @@ Resume

	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	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
@@ -25,7 +25,7 @@ bad
	</data>

	# The body should be ignored.
-	<datacheck crlf="yes">
+	<datacheck crlf="headers">
	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
@@ -54,7 +54,7 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C 87

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

tests/data/test920+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP login authentication with initial response
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret --sasl-ir -T -

tests/data/test921+3 -3

@@ -15,7 +15,7 @@ NTLM
	<reply>
	<servercmd>
	AUTH NTLM
-	REPLY AUTH 334 TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
+	REPLY AUTH 334 TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
	REPLY TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04= 235 Authenticated
	</servercmd>
	</reply>
@@ -34,8 +34,8 @@ SSL
	<name>
	SMTP NTLM authentication with initial response
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u testuser:testpass --sasl-ir -T -

tests/data/test922+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP OAuth 2.0 (XOAUTH2) authentication with initial response
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -

tests/data/test924+5 -5

@@ -9,11 +9,11 @@ VRFY
	#
	# Server-side
	<reply>
-	<data>
-	553-Ambiguous; Possibilities are:
-	553-Joe Smith <[email protected]>
-	553-Harry Smith <[email protected]>
-	553 Melvin Smith <[email protected]>
+	<data crlf="yes">
+	553-Ambiguous; Possibilities are:
+	553-Joe Smith <[email protected]>
+	553-Harry Smith <[email protected]>
+	553 Melvin Smith <[email protected]>
	</data>
	</reply>

tests/data/test925+2 -2

@@ -9,8 +9,8 @@ VRFY
	#
	# Server-side
	<reply>
-	<data>
-	252 Send some mail and I'll try my best
+	<data crlf="yes">
+	252 Send some mail and I'll try my best
	</data>
	</reply>

tests/data/test926+1 -1

@@ -10,7 +10,7 @@ VRFY
	# Server-side
	<reply>
	<servercmd>
-	REPLY VRFY 550 Unknown user
+	REPLY VRFY 550 Unknown user
	</servercmd>
	</reply>

tests/data/test927+4 -4

@@ -10,10 +10,10 @@ CUSTOMREQUEST
	#
	# Server-side
	<reply>
-	<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>

tests/data/test928+3 -3

@@ -9,9 +9,9 @@ HELP
	#
	# Server-side
	<reply>
-	<data>
-	214-This server supports the following commands:
-	214 HELO EHLO RCPT DATA RSET MAIL VRFY EXPN QUIT HELP
+	<data crlf="yes">
+	214-This server supports the following commands:
+	214 HELO EHLO RCPT DATA RSET MAIL VRFY EXPN QUIT HELP
	</data>
	</reply>

tests/data/test93+1 -1

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

tests/data/test935+2 -2

@@ -36,8 +36,8 @@ digest
	<name>
	SMTP CRAM-MD5 authentication with SASL downgrade
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret -T -

tests/data/test936+2 -2

@@ -37,8 +37,8 @@ SSL
	<name>
	SMTP NTLM authentication with SASL downgrade
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret -T -

tests/data/test937+2 -2

@@ -38,8 +38,8 @@ digest
	<name>
	SMTP DIGEST-MD5 authentication with SASL downgrade
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret -T -

tests/data/test938+3 -3

@@ -17,7 +17,7 @@ RFC4954
	AUTH PLAIN
	REPLY AUTH 334 PLAIN supported
	REPLY dXNlci5vbmUAdXNlci5vbmUAc2VjcmV0 235 Authenticated
-	REPLY dXNlci50d28AdXNlci50d28Ac2VjcmV0 235 Authenticated
+	REPLY dXNlci50d28AdXNlci50d28Ac2VjcmV0 235 Authenticated
	</servercmd>
	</reply>

@@ -30,8 +30,8 @@ smtp
	<name>
	SMTP multiple connection authentication
	</name>
-	<file name="%LOGDIR/upload%TESTNUMBER">
-	mail body
+	<file name="%LOGDIR/upload%TESTNUMBER" crlf="yes">
+	mail body
	</file>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER001 --mail-rcpt [email protected] --mail-from [email protected] -u user.one:secret -T %LOGDIR/upload%TESTNUMBER -: smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER002 --mail-rcpt [email protected] --mail-from [email protected] -u user.two:secret -T %LOGDIR/upload%TESTNUMBER

tests/data/test939+2 -2

@@ -23,8 +23,8 @@ smtp
	<name>
	RFC821-only SMTP with username and password
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret -T -

tests/data/test94+1 -1

@@ -45,7 +45,7 @@ https://test.anything.really.com:%TESTNUMBER --proxy1.0 %HOSTIP:%HTTPPORT
	<errorcode>
	56
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	CONNECT test.anything.really.com:%TESTNUMBER HTTP/1.0
	Host: test.anything.really.com:%TESTNUMBER
	User-Agent: curl/%VERSION

tests/data/test940+2 -2

@@ -19,8 +19,8 @@ smtp
	<name>
	SMTP with username and password but no AUTH capability
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user:secret -T -

tests/data/test942+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP external authentication
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test943+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP external authentication without credentials
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test944+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP external authentication with initial response
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	'smtp://user;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt [email protected] --mail-from [email protected] --sasl-ir -T -

tests/data/test945+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP external authentication with initial response without credentials
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	'smtp://;AUTH=EXTERNAL@%HOSTIP:%SMTPPORT/%TESTNUMBER' --mail-rcpt [email protected] --mail-from [email protected] --sasl-ir -T -

tests/data/test946+2 -2

@@ -29,8 +29,8 @@ smtp
	<name>
	SMTP OAuth 2.0 (OAUTHBEARER) authentication
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -

tests/data/test947+2 -2

@@ -29,8 +29,8 @@ smtp
	<name>
	SMTP OAuth 2.0 (OAUTHBEARER) authentication with initial response
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -

tests/data/test948+2 -2

@@ -30,8 +30,8 @@ smtp
	<name>
	SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user --oauth2-bearer mF_9.B5f-4.1JqM -T -

tests/data/test949+2 -2

@@ -30,8 +30,8 @@ smtp
	<name>
	SMTP OAuth 2.0 (OAUTHBEARER) failure as continuation with initial response
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user --oauth2-bearer mF_9.B5f-4.1JqM --sasl-ir -T -

tests/data/test95+9 -9

@@ -21,9 +21,9 @@ Content-Length: 9

	contents
	</data>
-	<connect>
-	HTTP/1.1 200 Mighty fine indeed
-
+	<connect crlf="headers">
+	HTTP/1.1 200 Mighty fine indeed
+
	</connect>
	<datacheck>
	HTTP/1.1 200 Mighty fine indeed
@@ -60,12 +60,12 @@ proxy
	#
	# Verify data after the test has been "shot"
	<verify>
-	<proxy>
-	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
-	Host: test.%TESTNUMBER:%HTTPPORT
-	User-Agent: curl/%VERSION
-	Proxy-Connection: Keep-Alive
-
+	<proxy crlf="headers">
+	CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.1
+	Host: test.%TESTNUMBER:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Proxy-Connection: Keep-Alive
+
	</proxy>
	<protocol crlf="headers" nonewline="yes">
	POST /we/want/that/page/%TESTNUMBER HTTP/1.1

tests/data/test950+2 -2

@@ -10,8 +10,8 @@ VRFY
	#
	# Server-side
	<reply>
-	<data>
-	250 <[email protected]>
+	<data crlf="yes">
+	250 <[email protected]>
	</data>
	</reply>

tests/data/test951+2 -2

@@ -19,8 +19,8 @@ smtp
	<name>
	SMTP data with dot as first character
	</name>
-	<stdin>
-	.This first line starts with a dot
+	<stdin crlf="yes">
+	.This first line starts with a dot
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test952+2 -2

@@ -19,8 +19,8 @@ smtp
	<name>
	SMTP data with single dot-only line
	</name>
-	<stdin>
-	.
+	<stdin crlf="yes">
+	.
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -T -

tests/data/test953+2 -2

@@ -28,8 +28,8 @@ smtp
	<name>
	SMTP plain authentication with alternative authorization identity
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u kurt:xipj3plmq --sasl-authzid ursel -T -

tests/data/test955+5 -5

@@ -29,11 +29,11 @@ LC_ALL=C.UTF-8
	<name>
	SMTP without SMTPUTF8 support - UTF-8 based sender (local part only)
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from Avs%hex[%c3%a4]hex%[email protected] -T -

tests/data/test956+5 -5

@@ -26,11 +26,11 @@ LC_ALL=C.UTF-8
	<name>
	SMTP without SMTPUTF8 support - UTF-8 based recipient (local part only)
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%[email protected] --mail-from [email protected] -T -

tests/data/test959+5 -5

@@ -30,11 +30,11 @@ LC_ALL=C.UTF-8
	<name>
	SMTP without SMTPUTF8 support - UTF-8 based sender (host part only)
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from sender@%hex[%c3%a5%c3%a4%c3%b6]hex%.se -T -

tests/data/test960+5 -5

@@ -27,11 +27,11 @@ LC_ALL=C.UTF-8
	<name>
	SMTP without SMTPUTF8 support - UTF-8 based recipient (host part only)
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3%b6]hex%.se --mail-from [email protected] -T -

tests/data/test962+5 -5

@@ -28,11 +28,11 @@ LC_ALL=C.UTF-8
	<name>
	SMTP without SMTPUTF8 support - UTF-8 based sender (host part only)
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from sender@%hex[%c3%a5%c3%a4%c3%b6]hex%.se -T -

tests/data/test963+5 -5

@@ -28,11 +28,11 @@ LC_ALL=C.UTF-8
	<name>
	SMTP without SMTPUTF8 support (IDN) - UTF-8 recipient (host part only)
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@%hex[%c3%a5%c3%a4%c3%b6]hex%.se --mail-from [email protected] -T -

tests/data/test965+5 -5

@@ -31,11 +31,11 @@ LC_ALL=C.UTF-8
	<name>
	SMTP with SMTPUTF8 support - UTF-8 based sender
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from Avs%hex[%c3%a4]hex%ndaren@%hex[%c3%a5%c3%a4%c3%b6]hex%.se -T -

tests/data/test966+5 -5

@@ -31,11 +31,11 @@ LC_ALL=C.UTF-8
	<name>
	SMTP with SMTPUTF8 support - UTF-8 based recipient
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt St%hex[%c3%b6]hex%dmottagaren@%hex[%c3%a5%c3%a4%c3%b6]hex%.se --mail-from [email protected] -T -

tests/data/test967+2 -2

@@ -13,8 +13,8 @@ IDN
	<servercmd>
	CAPA SMTPUTF8
	</servercmd>
-	<data>
-	252 Send some mail and I'll try my best
+	<data crlf="yes">
+	252 Send some mail and I'll try my best
	</data>
	</reply>

tests/data/test97+6 -6

@@ -9,12 +9,12 @@ HTTP replaced headers
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK
-	Server: test-server/fake
-	Content-Type: text/html
-	Content-Length: 6
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK
+	Server: test-server/fake
+	Content-Type: text/html
+	Content-Length: 6
+
	blaha
	</data>
	</reply>

tests/data/test970+1 -1

@@ -51,7 +51,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{json}' -o %LOGDIR/out%TESTNU
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test972+1 -1

@@ -52,7 +52,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -s --write-out '%{json}\n' -o %LOGDIR/out97
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test974+1 -1

@@ -72,7 +72,7 @@ HTTP with auth redirected to HTTP on a diff port w/o auth
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://firsthost.com/ HTTP/1.1
	Host: firsthost.com
	Authorization: Basic %b64[joe:secret]b64%

tests/data/test976+1 -1

@@ -72,7 +72,7 @@ HTTP with auth redirected to HTTP on a diff port --location-trusted
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://firsthost.com/ HTTP/1.1
	Host: firsthost.com
	Authorization: Basic %b64[joe:secret]b64%

tests/data/test977+1 -1

@@ -44,7 +44,7 @@ URL with trailing dot and receiving a cookie for the TLD with dot
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://firsthost.me./ HTTP/1.1
	Host: firsthost.me.
	User-Agent: curl/%VERSION

tests/data/test978+2 -2

@@ -9,7 +9,7 @@ HTTP
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -42,7 +42,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --stderr %LOGDIR/redir --silent -w '%{stder
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test979+3 -3

@@ -10,7 +10,7 @@ HTTP Basic auth
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 302 go go go
	Content-Length: 8
	Location: http://%HOSTIP:%HTTPPORT/user/%TESTNUMBER0002
@@ -19,7 +19,7 @@ Funny-head: yesyes

	notreal
	</data>
-	<data2 crlf="yes">
+	<data2 crlf="headers">
	HTTP/1.1 200 OK
	Content-Length: 6
	Content-Type: text/html
@@ -46,7 +46,7 @@ http://first:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u smith:doggie
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Authorization: Basic %b64[smith:doggie]b64%

tests/data/test98+6 -6

@@ -9,12 +9,12 @@ chunked Transfer-Encoding
	#
	# Server-side
	<reply>
-	<data>
-	HTTP/1.0 200 OK
-	Server: test-server/fake
-	Content-Type: text/html
-	Content-Length: 6
-
+	<data crlf="headers">
+	HTTP/1.0 200 OK
+	Server: test-server/fake
+	Content-Type: text/html
+	Content-Length: 6
+
	blaha
	</data>
	</reply>

tests/data/test987+5 -5

@@ -20,11 +20,11 @@ smtps
	<name>
	SMTPS with redundant explicit SSL request
	</name>
-	<stdin>
-	From: different
-	To: another
-
-	body
+	<stdin crlf="yes">
+	From: different
+	To: another
+
+	body
	</stdin>
	<command>
	--insecure --ssl-reqd --mail-rcpt [email protected] --mail-from [email protected] -T - smtps://%HOSTIP:%SMTPSPORT/%TESTNUMBER

tests/data/test989+8 -8

@@ -9,14 +9,14 @@ RETR
	#
	# 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>

tests/data/test99+1 -1

@@ -55,7 +55,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 9999999999
	<errorcode>
	33
	</errorcode>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	Range: bytes=9999999999-

tests/data/test990+2 -2

@@ -10,7 +10,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -43,7 +43,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%output{%LOGDIR/output}%{http_code}\n'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test991+2 -2

@@ -10,7 +10,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes">
+	<data crlf="headers">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -46,7 +46,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%output{>>%LOGDIR/output}%{http_code}'
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test992+2 -2

@@ -26,8 +26,8 @@ smtp
	<name>
	SASL verify default mechanisms are reset by login options
	</name>
-	<stdin>
-	mail body
+	<stdin crlf="yes">
+	mail body
	</stdin>
	<command>
	smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt [email protected] --mail-from [email protected] -u user --oauth2-bearer mF_9.B5f-4.1JqM --login-options "AUTH=XOAUTH2" -T -

tests/data/test995+2 -2

@@ -9,7 +9,7 @@ HTTP GET
	#
	# Server-side
	<reply>
-	<data crlf="yes" nocheck="yes">
+	<data crlf="headers" nocheck="yes">
	HTTP/1.1 200 OK
	Date: Tue, 09 Nov 2010 14:49:00 GMT
	Server: test-server/fake
@@ -42,7 +42,7 @@ http
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET /%TESTNUMBER HTTP/1.1
	Host: %HOSTIP:%HTTPPORT
	User-Agent: curl/%VERSION

tests/data/test998+1 -1

@@ -69,7 +69,7 @@ HTTP with auth in URL redirected to another host
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://somewhere.example/998 HTTP/1.1
	Host: somewhere.example
	Authorization: Basic %b64[alberto:einstein]b64%

tests/data/test999+1 -1

@@ -59,7 +59,7 @@ HTTP with auth in first URL but not second
	#
	# Verify data after the test has been "shot"
	<verify>
-	<protocol crlf="yes">
+	<protocol crlf="headers">
	GET http://somewhere.example/%TESTNUMBER HTTP/1.1
	Host: somewhere.example
	Authorization: Basic %b64[alberto:einstein]b64%

tests/runner.pm+24 -12

@@ -299,7 +299,7 @@ sub prepro {
	my (@entiretest) = @_;
	my $show = 1;
	my @out;
-	my $data_crlf;
+	my $data_crlf = "";
	my @pshow;
	my @altshow;
	my $plvl;
@@ -351,21 +351,26 @@ sub prepro {
	next;
	}
	if($show) {
-	# The processor does CRLF replacements in the <data*> sections if
-	# necessary since those parts might be read by separate servers.
-	if($s =~ /^ <data(.)\>/) {
-	if($1 =~ /crlf="yes"/) {
-	$data_crlf = 1;
+	# The processor does CRLF replacements in the <data> and <connect>
+	# sections if necessary since those parts might be read by separate
+	# servers.
+	if($s =~ /^ <(data\|connect)(.)\>/) {
+	if($2 =~ /crlf="yes"/) {
+	$data_crlf = "yes";
+	}
+	elsif($2 =~ /crlf="headers"/) {
+	$data_crlf = "headers";
	}
	}
-	elsif(($s =~ /^ *<\/data/) && $data_crlf) {
-	$data_crlf = 0;
+	elsif(($s =~ /^ *<\/(data\|connect)/) && $data_crlf ne "") {
+	$data_crlf = "";
	}
	subvariables(\$s, $testnum, "%");
	subbase64(\$s);
	subsha256base64file(\$s);
	substrippemfile(\$s);
-	subnewlines(0, \$s) if($data_crlf);
+	subnewlines(1, \$s) if($data_crlf eq "yes");
+	subnewlines(0, \$s) if($data_crlf eq "headers");
	push @out, $s;
	}
	}
@@ -758,7 +763,6 @@ sub singletest_prepare {
	logmsg " $testnum: IGNORED: Section client=>file has no name attribute\n";
	return -1;
	}
-	my $fileContent = join('', @inputfile);

	# make directories if needed
	my $path = dirname($filename);
@@ -775,11 +779,15 @@ sub singletest_prepare {
	}
	if(open(my $outfile, ">", "$filename")) {
	binmode $outfile; # for crapage systems, use binary
+
	if($fileattr{'nonewline'}) {
	# cut off the final newline
-	chomp($fileContent);
+	chomp($inputfile[-1]);
+	}
+	if($fileattr{'crlf'}) {
+	subnewlines(1, \$_) for @inputfile;
	}
-	print $outfile $fileContent;
+	print $outfile join('', @inputfile);
	close($outfile);
	} else {
	logmsg "ERROR: cannot write $filename\n";
@@ -947,6 +955,10 @@ sub singletest_run {
	chomp($stdintest[-1]);
	}

+	if($hash{'crlf'}) {
+	subnewlines(1, \$_) for @stdintest;
+	}
+
	writearray($stdinfile, \@stdintest);

	$cmdargs .= " <$stdinfile";

tests/runtests.pl+36 -6

@@ -1306,7 +1306,12 @@ sub singletest_check {
	}

	if($hash{'crlf'}) {
-	subnewlines(0, \$_) for @validstdout;
+	if($hash{'crlf'} eq "headers") {
+	subnewlines(0, \$_) for @validstdout;
+	}
+	else {
+	subnewlines(1, \$_) for @validstdout;
+	}
	}

	$res = compare($runnerid, $testnum, $testname, "stdout", \@actual, \@validstdout);
@@ -1355,7 +1360,12 @@ sub singletest_check {
	}

	if($hash{'crlf'}) {
-	subnewlines(0, \$_) for @validstderr;
+	if($hash{'crlf'} eq "headers") {
+	subnewlines(0, \$_) for @validstderr;
+	}
+	else {
+	subnewlines(1, \$_) for @validstderr;
+	}
	}

	$res = compare($runnerid, $testnum, $testname, "stderr", \@actual, \@validstderr);
@@ -1451,7 +1461,12 @@ sub singletest_check {
	chomp($replycheckpart[-1]);
	}
	if($replycheckpartattr{'crlf'}) {
-	subnewlines(0, \$_) for @replycheckpart;
+	if($replycheckpartattr{'crlf'} eq "headers") {
+	subnewlines(0, \$_) for @replycheckpart;
+	}
+	else {
+	subnewlines(1, \$_) for @replycheckpart;
+	}
	}
	push(@reply, @replycheckpart);
	}
@@ -1472,7 +1487,12 @@ sub singletest_check {
	normalize_text(\@reply);
	}
	if($replyattr{'crlf'}) {
-	subnewlines(0, \$_) for @reply;
+	if($replyattr{'crlf'} eq "headers") {
+	subnewlines(0, \$_) for @reply;
+	}
+	else {
+	subnewlines(1, \$_) for @reply;
+	}
	}
	}

@@ -1565,7 +1585,12 @@ sub singletest_check {
	}

	if($hash{'crlf'}) {
-	subnewlines(0, \$_) for @proxyprot;
+	if($hash{'crlf'} eq "headers") {
+	subnewlines(0, \$_) for @proxyprot;
+	}
+	else {
+	subnewlines(1, \$_) for @proxyprot;
+	}
	}

	$res = compare($runnerid, $testnum, $testname, "proxy", \@out, \@proxyprot);
@@ -1623,7 +1648,12 @@ sub singletest_check {
	normalize_text(\@generated);
	}
	if($hash{'crlf'}) {
-	subnewlines(0, \$_) for @outfile;
+	if($hash{'crlf'} eq "headers") {
+	subnewlines(0, \$_) for @outfile;
+	}
+	else {
+	subnewlines(1, \$_) for @outfile;
+	}
	}

	for my $strip (@stripfilepar) {

tests/testutil.pm+1 -1

@@ -164,7 +164,7 @@ sub subnewlines {
	return;
	}

-	if(($$thing =~ /^HTTP\/(1.1\|1.0\|2\|3) [1-5][^\x0d]*\z/) \|\|
+	if(($$thing =~ /^HTTP\/(1.1\|1.0\|2\|3) ([1-5]\|9)[^\x0d]*\z/) \|\|
	($$thing =~ /^(GET\|HEAD\|POST\|PUT\|DELETE\|CONNECT) \S+ HTTP\/\d+(\.\d+)?/) \|\|
	($$thing =~ /^(SETUP\|GET_PARAMETER\|OPTIONS\|ANNOUNCE\|DESCRIBE) \S+ RTSP\/\d+(\.\d+)?/) \|\|
	(($$thing =~ /^[a-z0-9_-]+: [^\x0d]*\z/i) &&