diff --git a/access_log_variables.t b/access_log_variables.t
index 7fd5d66c..506d7a76 100644
--- a/access_log_variables.t
+++ b/access_log_variables.t
@@ -93,13 +93,13 @@ my $bytes_sent = length http_get('/bytes');
 # pipelined requests
 
 http(<<EOF);
-GET /pipe HTTP/1.1
-Host: localhost
-
-GET /pipe HTTP/1.1
-Host: localhost
-Connection: close
-
+GET /pipe HTTP/1.1\r
+Host: localhost\r
+\r
+GET /pipe HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 $t->stop();
@@ -116,7 +116,7 @@ $log = $t->read_file('msec.log');
 like($log, qr!/msec [\d\.]+!, 'msec');
 
 $log = $t->read_file('request.log');
-like($log, qr!/request 200 39 [\d\.]+!, 'request');
+like($log, qr!/request 200 42 [\d\.]+!, 'request');
 
 $log = $t->read_file('bytes.log');
 is($log, "/bytes $bytes_sent 2\n", 'bytes sent');
diff --git a/auth_basic.t b/auth_basic.t
index 6f7270b0..826c6896 100644
--- a/auth_basic.t
+++ b/auth_basic.t
@@ -133,10 +133,10 @@ sub http_get_auth {
 	my $auth = encode_base64($user . ':' . $password, '');
 
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-Authorization: Basic $auth
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+Authorization: Basic $auth\r
+\r
 EOF
 }
 
diff --git a/auth_delay.t b/auth_delay.t
index 90034eb4..4a5cb25b 100644
--- a/auth_delay.t
+++ b/auth_delay.t
@@ -75,10 +75,10 @@ sub http_get_auth {
 	my $auth = encode_base64($user . ':' . $password, '');
 
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-Authorization: Basic $auth
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+Authorization: Basic $auth\r
+\r
 EOF
 }
 
diff --git a/auth_request.t b/auth_request.t
index 9ab32ded..0fcf803f 100644
--- a/auth_request.t
+++ b/auth_request.t
@@ -228,10 +228,10 @@ SKIP: {
 sub http_get_auth {
 	my ($url, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $url HTTP/1.0
-Host: localhost
-Authorization: Basic dXNlcjpzZWNyZXQ=
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+Authorization: Basic dXNlcjpzZWNyZXQ=\r
+\r
 EOF
 }
 
@@ -268,8 +268,8 @@ sub fastcgi_daemon {
 
 	while ($request->Accept() >= 0) {
 		print <<EOF;
-Content-Type: text/html
-
+Content-Type: text/html\r
+\r
 INVISIBLE
 EOF
 	}
diff --git a/dav.t b/dav.t
index 71ee7fdb..53ef57b4 100644
--- a/dav.t
+++ b/dav.t
@@ -61,22 +61,22 @@ $t->run();
 my $r;
 
 $r = http(<<EOF . '0123456789');
-PUT /file HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 10
-
+PUT /file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 10\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'put file');
 is(-s $t->testdir() . '/file', 10, 'put file size');
 
 $r = http(<<EOF);
-PUT /file HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 0
-
+PUT /file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 0\r
+\r
 EOF
 
 like($r, qr/204 No Content/, 'put file again');
@@ -84,11 +84,11 @@ unlike($r, qr/Content-Length|Transfer-Encoding/, 'no length in 204');
 is(-s $t->testdir() . '/file', 0, 'put file again size');
 
 $r = http(<<EOF);
-DELETE /file HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 0
-
+DELETE /file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 0\r
+\r
 EOF
 
 like($r, qr/204 No Content/, 'delete file');
@@ -96,11 +96,11 @@ unlike($r, qr/Content-Length|Transfer-Encoding/, 'no length in 204');
 ok(!-f $t->testdir() . '/file', 'file deleted');
 
 $r = http(<<EOF . '0123456789' . 'extra');
-PUT /file HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 10
-
+PUT /file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 10\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms,
@@ -109,11 +109,11 @@ is(-s $t->testdir() . '/file', 10,
 	'put file extra data size');
 
 $r = http(<<EOF . '0123456789');
-PUT /file%20sp HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 10
-
+PUT /file%20sp HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 10\r
+\r
 EOF
 
 like($r, qr!Location: /file%20sp\x0d?$!ms, 'put file escaped');
@@ -121,10 +121,10 @@ like($r, qr!Location: /file%20sp\x0d?$!ms, 'put file escaped');
 # 201 replies contain body, response should indicate it's empty
 
 $r = http(<<EOF);
-MKCOL /test/ HTTP/1.1
-Host: localhost
-Connection: close
-
+MKCOL /test/ HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'mkcol');
@@ -137,31 +137,31 @@ like($r, qr!(?(?{ $r =~ /Location/ })Location: /test/)!, 'mkcol location');
 }
 
 $r = http(<<EOF);
-COPY /test/ HTTP/1.1
-Host: localhost
-Destination: /test-moved/
-Connection: close
-
+COPY /test/ HTTP/1.1\r
+Host: localhost\r
+Destination: /test-moved/\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'copy dir');
 
 $r = http(<<EOF);
-MOVE /test/ HTTP/1.1
-Host: localhost
-Destination: /test-moved/
-Connection: close
-
+MOVE /test/ HTTP/1.1\r
+Host: localhost\r
+Destination: /test-moved/\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'move dir');
 
 $r = http(<<EOF);
-COPY /file HTTP/1.1
-Host: localhost
-Destination: /file-moved%20escape
-Connection: close
-
+COPY /file HTTP/1.1\r
+Host: localhost\r
+Destination: /file-moved%20escape\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/204 No Content/, 'copy file escaped');
@@ -170,22 +170,22 @@ is(-s $t->testdir() . '/file-moved escape', 10, 'file copied unescaped');
 $t->write_file('file.exist', join '', (1 .. 42));
 
 $r = http(<<EOF);
-COPY /file HTTP/1.1
-Host: localhost
-Destination: /file.exist
-Connection: close
-
+COPY /file HTTP/1.1\r
+Host: localhost\r
+Destination: /file.exist\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/204 No Content/, 'copy file overwrite');
 is(-s $t->testdir() . '/file.exist', 10, 'target file truncated');
 
 $r = http(<<EOF . '0123456789');
-PUT /i/alias HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 10
-
+PUT /i/alias HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 10\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'put alias');
@@ -195,75 +195,75 @@ is(-s $t->testdir() . '/alias', 10, 'put alias size');
 # request methods with unsupported request body
 
 $r = http(<<EOF . '0123456789');
-MKCOL /test/ HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 10
-
+MKCOL /test/ HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 10\r
+\r
 EOF
 
 like($r, qr/415 Unsupported/, 'mkcol body');
 
 $r = http(<<EOF . '0123456789');
-COPY /file HTTP/1.1
-Host: localhost
-Destination: /file.exist
-Connection: close
-Content-Length: 10
-
+COPY /file HTTP/1.1\r
+Host: localhost\r
+Destination: /file.exist\r
+Connection: close\r
+Content-Length: 10\r
+\r
 EOF
 
 like($r, qr/415 Unsupported/, 'copy body');
 
 $r = http(<<EOF . '0123456789');
-DELETE /file HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 10
-
+DELETE /file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 10\r
+\r
 EOF
 
 like($r, qr/415 Unsupported/, 'delete body');
 
 $r = http(<<EOF);
-MKCOL /test/ HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
-a
-0123456789
-0
-
+MKCOL /test/ HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+a\r
+0123456789\r
+0\r
+\r
 EOF
 
 like($r, qr/415 Unsupported/, 'mkcol body chunked');
 
 $r = http(<<EOF);
-COPY /file HTTP/1.1
-Host: localhost
-Destination: /file.exist
-Connection: close
-Transfer-Encoding: chunked
-
-a
-0123456789
-0
-
+COPY /file HTTP/1.1\r
+Host: localhost\r
+Destination: /file.exist\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+a\r
+0123456789\r
+0\r
+\r
 EOF
 
 like($r, qr/415 Unsupported/, 'copy body chunked');
 
 $r = http(<<EOF);
-DELETE /file HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
-a
-0123456789
-0
-
+DELETE /file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+a\r
+0123456789\r
+0\r
+\r
 EOF
 
 like($r, qr/415 Unsupported/, 'delete body chunked');
diff --git a/dav_chunked.t b/dav_chunked.t
index 3c63ad26..40b21898 100644
--- a/dav_chunked.t
+++ b/dav_chunked.t
@@ -58,28 +58,28 @@ $t->run();
 my $r;
 
 $r = http(<<EOF);
-PUT /file HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
-a
-1234567890
-0
-
+PUT /file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+a\r
+1234567890\r
+0\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'put chunked');
 is($t->read_file('file'), '1234567890', 'put content');
 
 $r = http(<<EOF);
-PUT /file HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
-0
-
+PUT /file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+0\r
+\r
 EOF
 
 like($r, qr/204 No Content/, 'put chunked empty');
@@ -88,11 +88,11 @@ is($t->read_file('file'), '', 'put empty content');
 my $body = ('a' . CRLF . '1234567890' . CRLF) x 1024 . '0' . CRLF . CRLF;
 
 $r = http(<<EOF);
-PUT /file HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
+PUT /file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
 $body
 EOF
 
diff --git a/dav_utf8.t b/dav_utf8.t
index 83631b5d..4a6aecb4 100644
--- a/dav_utf8.t
+++ b/dav_utf8.t
@@ -66,44 +66,44 @@ my $file = "file-%D0%BC%D0%B8";
 my $file_path = "file-\x{043c}\x{0438}";
 
 $r = http(<<EOF . '0123456789');
-PUT /$file HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 10
-
+PUT /$file HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 10\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'put file');
 ok(fileexists("$d/$file_path"), 'put file exist');
 
 $r = http(<<EOF);
-COPY /$file HTTP/1.1
-Host: localhost
-Destination: /$file-moved
-Connection: close
-
+COPY /$file HTTP/1.1\r
+Host: localhost\r
+Destination: /$file-moved\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/204 No Content/, 'copy file');
 ok(fileexists("$d/$file_path-moved"), 'copy file exist');
 
 $r = http(<<EOF);
-MOVE /$file HTTP/1.1
-Host: localhost
-Destination: /$file-moved
-Connection: close
-
+MOVE /$file HTTP/1.1\r
+Host: localhost\r
+Destination: /$file-moved\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/204 No Content/, 'move file');
 ok(!fileexists("$d/$file_path"), 'file moved');
 
 $r = http(<<EOF);
-DELETE /$file-moved HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: 0
-
+DELETE /$file-moved HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: 0\r
+\r
 EOF
 
 like($r, qr/204 No Content/, 'delete file');
@@ -113,42 +113,42 @@ my $dir = "dir-%D0%BC%D0%B8";
 my $dir_path = "dir-\x{043c}\x{0438}";
 
 $r = http(<<EOF);
-MKCOL /$dir/ HTTP/1.1
-Host: localhost
-Connection: close
-
+MKCOL /$dir/ HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'mkcol');
 ok(fileexists("$d/$dir_path"), 'mkcol exist');
 
 $r = http(<<EOF);
-COPY /$dir/ HTTP/1.1
-Host: localhost
-Destination: /$dir-moved/
-Connection: close
-
+COPY /$dir/ HTTP/1.1\r
+Host: localhost\r
+Destination: /$dir-moved/\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'copy dir');
 ok(fileexists("$d/$dir_path-moved"), 'copy dir exist');
 
 $r = http(<<EOF);
-MOVE /$dir/ HTTP/1.1
-Host: localhost
-Destination: /$dir-moved/
-Connection: close
-
+MOVE /$dir/ HTTP/1.1\r
+Host: localhost\r
+Destination: /$dir-moved/\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/201 Created.*(Content-Length|\x0d\0a0\x0d\x0a)/ms, 'move dir');
 ok(!fileexists("$d/$dir_path"), 'dir moved');
 
 $r = http(<<EOF);
-DELETE /$dir-moved/ HTTP/1.1
-Host: localhost
-Connection: close
-
+DELETE /$dir-moved/ HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 unlike($r, qr/200 OK.*Content-Length|Transfer-Encoding/ms, 'delete dir');
diff --git a/fastcgi.t b/fastcgi.t
index 91033113..4b1719e9 100644
--- a/fastcgi.t
+++ b/fastcgi.t
@@ -100,9 +100,9 @@ sub fastcgi_daemon {
 		}
 
 		print <<EOF;
-Location: http://localhost/redirect
-Content-Type: text/html
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+\r
 SEE-THIS
 $count
 EOF
diff --git a/fastcgi_body.t b/fastcgi_body.t
index d94916af..791e6a7b 100644
--- a/fastcgi_body.t
+++ b/fastcgi_body.t
@@ -60,25 +60,25 @@ like(http_get_length('/', 'foobar'), qr/X-Body: foobar_eos\x0d?$/ms,
 	'fastcgi body');
 
 like(http(<<EOF), qr/X-Body: foobar_eos\x0d?$/ms, 'fastcgi chunked');
-GET / HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
-6
-foobar
-0
-
+GET / HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+6\r
+foobar\r
+0\r
+\r
 EOF
 
 like(http(<<EOF), qr/X-Body: _eos\x0d?$/ms, 'fastcgi empty chunked');
-GET / HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
-0
-
+GET / HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+0\r
+\r
 EOF
 
 ###############################################################################
@@ -87,11 +87,11 @@ sub http_get_length {
 	my ($url, $body) = @_;
 	my $length = length $body;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: $length
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: $length\r
+\r
 $body
 EOF
 }
@@ -171,10 +171,10 @@ sub fastcgi_daemon {
 
 		# respond
 		fastcgi_respond($client, $version, $id, <<EOF);
-Location: http://localhost/redirect
-Content-Type: text/html
-X-Body: $body
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+X-Body: $body\r
+\r
 SEE-THIS
 EOF
 	}
diff --git a/fastcgi_body2.t b/fastcgi_body2.t
index 65e927dd..54d8a6ad 100644
--- a/fastcgi_body2.t
+++ b/fastcgi_body2.t
@@ -97,10 +97,10 @@ sub http_get_length {
 	my ($url, $body) = @_;
 	my $length = length $body;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-Content-Length: $length
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+Content-Length: $length\r
+\r
 $body
 EOF
 }
@@ -120,10 +120,10 @@ sub fastcgi_daemon {
 		sleep 3 if $port == port(8081);
 
 		print <<EOF;
-Location: http://localhost/redirect
-Content-Type: text/html
-X-Length: $len
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+X-Length: $len\r
+\r
 EOF
 	}
 
diff --git a/fastcgi_cache.t b/fastcgi_cache.t
index df4f50da..65b114e8 100644
--- a/fastcgi_cache.t
+++ b/fastcgi_cache.t
@@ -92,9 +92,9 @@ sub fastcgi_daemon {
 		}
 
 		print <<EOF;
-Location: http://localhost/redirect
-Content-Type: text/html
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+\r
 SEE-THIS
 $count
 EOF
diff --git a/fastcgi_extra_data.t b/fastcgi_extra_data.t
index 2f353807..64fea192 100644
--- a/fastcgi_extra_data.t
+++ b/fastcgi_extra_data.t
@@ -141,42 +141,42 @@ sub fastcgi_daemon {
 		$head = $ENV{REQUEST_METHOD} eq 'HEAD';
 
 		if ($uri eq '/') {
-			print "Content-Type: text/html\n";
-			print "Content-Length: 8\n\n";
+			print "Content-Type: text/html\r\n";
+			print "Content-Length: 8\r\n\r\n";
 			print "SEE-THIS-BUT-NOT-THIS\n";
 
 		} elsif ($uri eq '/zero') {
-			print "Content-Type: text/html\n";
-			print "Content-Length: 0\n\n";
+			print "Content-Type: text/html\r\n";
+			print "Content-Length: 0\r\n\r\n";
 			print "NOT-THIS\n";
 
 		} elsif ($uri eq '/short') {
-			print "Content-Type: text/html\n";
-			print "Content-Length: 100\n\n";
+			print "Content-Type: text/html\r\n";
+			print "Content-Length: 100\r\n\r\n";
 			print "SEE-THIS-TOO-SHORT-RESPONSE\n";
 
 		} elsif ($uri eq '/empty') {
-			print "Content-Type: text/html\n";
-			print "Content-Length: 100\n\n";
+			print "Content-Type: text/html\r\n";
+			print "Content-Length: 100\r\n\r\n";
 
 		} elsif ($uri eq '/head/empty') {
-			print "Content-Type: text/html\n";
-			print "Content-Length: 8\n\n";
+			print "Content-Type: text/html\r\n";
+			print "Content-Length: 8\r\n\r\n";
 			print "SEE-THIS" unless $head;
 
 		} elsif ($uri eq '/head/matching') {
-			print "Content-Type: text/html\n";
-			print "Content-Length: 8\n\n";
+			print "Content-Type: text/html\r\n";
+			print "Content-Length: 8\r\n\r\n";
 			print "SEE-THIS";
 
 		} elsif ($uri eq '/head/extra') {
-			print "Content-Type: text/html\n";
-			print "Content-Length: 8\n\n";
+			print "Content-Type: text/html\r\n";
+			print "Content-Length: 8\r\n\r\n";
 			print "SEE-THIS-BUT-NOT-THIS\n";
 
 		} elsif ($uri eq '/head/short') {
-			print "Content-Type: text/html\n";
-			print "Content-Length: 100\n\n";
+			print "Content-Type: text/html\r\n";
+			print "Content-Length: 100\r\n\r\n";
 			print "SEE-THIS\n";
 		}
 	}
diff --git a/fastcgi_header_params.t b/fastcgi_header_params.t
index e7a41826..27c7c367 100644
--- a/fastcgi_header_params.t
+++ b/fastcgi_header_params.t
@@ -65,18 +65,18 @@ local $TODO = 'not yet' unless $t->has_version('1.23.0');
 my $r;
 
 $r = http(<<EOF);
-GET / HTTP/1.0
-Host: localhost
-X-Forwarded-For: foo
-X-Forwarded-For: bar
-X-Forwarded-For: bazz
-Cookie: foo
-Cookie: bar
-Cookie: bazz
-Foo: foo
-Foo: bar
-Foo: bazz
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: foo\r
+X-Forwarded-For: bar\r
+X-Forwarded-For: bazz\r
+Cookie: foo\r
+Cookie: bar\r
+Cookie: bazz\r
+Foo: foo\r
+Foo: bar\r
+Foo: bazz\r
+\r
 EOF
 
 like($r, qr/X-Forwarded-For: foo, bar, bazz/,
@@ -95,28 +95,28 @@ like($r, qr/X-Foo: foo, bar, bazz/,
 sub http_get_headers {
 	my ($url, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $url HTTP/1.0
-Host: localhost
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+\r
 EOF
 }
 
@@ -136,12 +136,12 @@ sub fastcgi_daemon {
 		my $foo = $ENV{HTTP_FOO} || '';
 
 		print <<EOF;
-Location: http://localhost/redirect
-Content-Type: text/html
-X-Forwarded-For: $xfwd
-X-Cookie: $cookie
-X-Foo: $foo
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+X-Forwarded-For: $xfwd\r
+X-Cookie: $cookie\r
+X-Foo: $foo\r
+\r
 SEE-THIS
 $count
 EOF
diff --git a/fastcgi_keepalive.t b/fastcgi_keepalive.t
index ba9591f7..26ccb0aa 100644
--- a/fastcgi_keepalive.t
+++ b/fastcgi_keepalive.t
@@ -167,9 +167,9 @@ sub fastcgi_test_daemon {
 
 			# respond
 			fastcgi_respond($h, <<EOF);
-Location: http://localhost/redirect
-Content-Type: text/html
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+\r
 SEE-THIS
 request: $rcount
 connection: $ccount
diff --git a/fastcgi_merge_params.t b/fastcgi_merge_params.t
index 0471c578..befad492 100644
--- a/fastcgi_merge_params.t
+++ b/fastcgi_merge_params.t
@@ -100,12 +100,12 @@ like(http_get_ims('/custom/'), qr/blah=custom;/,
 sub http_get_ims {
 	my ($url) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-Connection: close
-If-Modified-Since: blah
-If-Unmodified-Since: blah
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+If-Modified-Since: blah\r
+If-Unmodified-Since: blah\r
+\r
 EOF
 }
 
@@ -125,9 +125,9 @@ sub fastcgi_daemon {
 		my $blah = $ENV{HTTP_X_BLAH} || '';
 
 		print <<EOF;
-Location: http://localhost/redirect
-Content-Type: text/html
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+\r
 ims=$ims;iums=$iums;blah=$blah;
 EOF
 	}
diff --git a/fastcgi_merge_params2.t b/fastcgi_merge_params2.t
index 8a25cd85..b1abd209 100644
--- a/fastcgi_merge_params2.t
+++ b/fastcgi_merge_params2.t
@@ -84,12 +84,12 @@ like(http_get_ims('/no/'), qr/iums=blah;/,
 sub http_get_ims {
 	my ($url) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-Connection: close
-If-Modified-Since: blah
-If-Unmodified-Since: blah
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+If-Modified-Since: blah\r
+If-Unmodified-Since: blah\r
+\r
 EOF
 }
 
@@ -109,9 +109,9 @@ sub fastcgi_daemon {
 		my $blah = $ENV{HTTP_X_BLAH} || '';
 
 		print <<EOF;
-Location: http://localhost/redirect
-Content-Type: text/html
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+\r
 ims=$ims;iums=$iums;blah=$blah;
 EOF
 	}
diff --git a/fastcgi_request_buffering.t b/fastcgi_request_buffering.t
index 230156c8..b30264e7 100644
--- a/fastcgi_request_buffering.t
+++ b/fastcgi_request_buffering.t
@@ -220,11 +220,11 @@ sub get_body {
 		or die "Can't create listening socket: $!\n";
 
 	my $r = <<EOF;
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: $length
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: $length\r
+\r
 EOF
 
 	if (defined $body) {
@@ -309,10 +309,10 @@ EOF
 			alarm(5);
 
 			fastcgi_respond($client, $version, $id, <<EOF);
-Status: 200 OK
-Connection: close
-X-Port: $port
-
+Status: 200 OK\r
+Connection: close\r
+X-Port: $port\r
+\r
 OK
 EOF
 
@@ -358,10 +358,10 @@ sub fastcgi_daemon {
 		}
 
 		print <<EOF;
-Location: http://localhost/redirect
-Content-Type: text/html
-X-Body: $body
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+X-Body: $body\r
+\r
 SEE-THIS
 $count
 EOF
diff --git a/fastcgi_request_buffering_chunked.t b/fastcgi_request_buffering_chunked.t
index 51d43891..48eeb85e 100644
--- a/fastcgi_request_buffering_chunked.t
+++ b/fastcgi_request_buffering_chunked.t
@@ -241,11 +241,11 @@ sub get_body {
 		or die "Can't create listening socket: $!\n";
 
 	my $r = <<EOF;
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
 EOF
 
 	if (defined $body) {
@@ -352,10 +352,10 @@ EOF
 			alarm(5);
 
 			fastcgi_respond($client, $version, $id, <<EOF);
-Status: 200 OK
-Connection: close
-X-Port: $port
-
+Status: 200 OK\r
+Connection: close\r
+X-Port: $port\r
+\r
 OK
 EOF
 
@@ -408,10 +408,10 @@ sub fastcgi_daemon {
 		}
 
 		print <<EOF;
-Location: http://localhost/redirect
-Content-Type: text/html
-X-Body: $body
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+X-Body: $body\r
+\r
 SEE-THIS
 $count
 EOF
diff --git a/fastcgi_unix.t b/fastcgi_unix.t
index 0ff7b905..df424a34 100644
--- a/fastcgi_unix.t
+++ b/fastcgi_unix.t
@@ -105,9 +105,9 @@ sub fastcgi_daemon {
 		}
 
 		print <<EOF;
-Location: http://localhost/redirect
-Content-Type: text/html
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+\r
 SEE-THIS
 $count
 EOF
diff --git a/geo.t b/geo.t
index 95e384b9..2d54fd70 100644
--- a/geo.t
+++ b/geo.t
@@ -240,10 +240,10 @@ like(http_xff('192.0.2.1, 127.0.0.1'), qr/^X-XFR: test/m,
 sub http_xff {
 	my ($xff) = @_;
 	return http(<<EOF);
-GET /1 HTTP/1.0
-Host: localhost
-X-Forwarded-For: $xff
-
+GET /1 HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: $xff\r
+\r
 EOF
 }
 
diff --git a/geo_ipv6.t b/geo_ipv6.t
index ace28dbd..59ff97a9 100644
--- a/geo_ipv6.t
+++ b/geo_ipv6.t
@@ -112,10 +112,10 @@ like(http_get('/?ip=::ffff:192.0.2.1'), qr/^X-Arg: test/m,
 sub http_xff {
 	my ($xff) = @_;
 	return http(<<EOF);
-GET / HTTP/1.0
-Host: localhost
-X-Forwarded-For: $xff
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: $xff\r
+\r
 EOF
 }
 
diff --git a/geoip.t b/geoip.t
index fa65a17d..2d1b7f32 100644
--- a/geoip.t
+++ b/geoip.t
@@ -180,10 +180,10 @@ like($r, qr/X-Country-Name: United States/, 'geoip ipv6 country name');
 sub http_xff {
 	my ($xff) = @_;
 	return http(<<EOF);
-GET / HTTP/1.0
-Host: localhost
-X-Forwarded-For: $xff
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: $xff\r
+\r
 EOF
 }
 
diff --git a/grpc_trailers.t b/grpc_trailers.t
index 10b003a6..8a92ef39 100644
--- a/grpc_trailers.t
+++ b/grpc_trailers.t
@@ -152,11 +152,11 @@ is($frame->{headers}->{'x-another'}, 'bar', 'h3 trailer 2');
 sub get {
 	my ($uri) = @_;
 	http(<<EOF);
-GET $uri HTTP/1.1
-Host: localhost
-Connection: te, close
-TE: trailers
-
+GET $uri HTTP/1.1\r
+Host: localhost\r
+Connection: te, close\r
+TE: trailers\r
+\r
 EOF
 }
 
diff --git a/gzip.t b/gzip.t
index c720faa4..54ff2b2d 100644
--- a/gzip.t
+++ b/gzip.t
@@ -86,11 +86,11 @@ unlike(http_head('/'), qr/Content-Encoding: gzip/, 'no gzip head');
 sub http_gzip_head {
 	my ($uri) = @_;
 	return http(<<EOF);
-HEAD $uri HTTP/1.1
-Host: localhost
-Connection: close
-Accept-Encoding: gzip
-
+HEAD $uri HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Accept-Encoding: gzip\r
+\r
 EOF
 }
 
diff --git a/h2_fastcgi_request_buffering.t b/h2_fastcgi_request_buffering.t
index f2aed2cd..5b44fffb 100644
--- a/h2_fastcgi_request_buffering.t
+++ b/h2_fastcgi_request_buffering.t
@@ -249,9 +249,9 @@ sub get_body {
 		local $SIG{PIPE} = 'IGNORE';
 
 		fastcgi_respond($client, $version, $id, <<EOF);
-Status: 200 OK
-Connection: close
-
+Status: 200 OK\r
+Connection: close\r
+\r
 OK
 EOF
 
diff --git a/h2_headers.t b/h2_headers.t
index cdf3073d..d11fcd38 100644
--- a/h2_headers.t
+++ b/h2_headers.t
@@ -426,7 +426,7 @@ unlike($s->{headers}, qr/aaaaa/, 'well known chars - huffman encoding');
 # response header field with huffman encoding - complete table mod \0, CR, LF
 # first saturate with short-encoded characters (NB: implementation detail)
 
-my $field = pack "C*", ((map { 97 } (1 .. 862)), 1 .. 9, 11, 12, 14 .. 255);
+my $field = pack "C*", ((map { 97 } (1 .. 862)), 9, 32 .. 126, 128 .. 255);
 
 $s = Test::Nginx::HTTP2->new();
 $sid = $s->new_stream({ headers => [
@@ -1198,31 +1198,31 @@ sub http_daemon {
 
 		if ($uri eq '/cookie') {
 
-			my ($cookie, $cookie2) = $headers =~ /Cookie: (.+)/ig;
+			my ($cookie, $cookie2) = $headers =~ /^Cookie: ([\t -~]+)\r\n/igm;
 			$cookie2 = '' unless defined $cookie2;
 
 			my ($cookie_a, $cookie_c) = ('', '');
-			$cookie_a = $1 if $headers =~ /X-Cookie-a: (.+)/i;
-			$cookie_c = $1 if $headers =~ /X-Cookie-c: (.+)/i;
+			$cookie_a = $1 if $headers =~ /^X-Cookie-a: ([\t -~]+)\r\n/im;
+			$cookie_c = $1 if $headers =~ /^X-Cookie-c: ([\t -~]+)\r\n/im;
 
 			print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Sent-Cookie: $cookie
-X-Sent-Cookie2: $cookie2
-X-Sent-Cookie-a: $cookie_a
-X-Sent-Cookie-c: $cookie_c
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Sent-Cookie: $cookie\r
+X-Sent-Cookie2: $cookie2\r
+X-Sent-Cookie-a: $cookie_a\r
+X-Sent-Cookie-c: $cookie_c\r
+\r
 EOF
 
 		} elsif ($uri eq '/set-cookie') {
 
 			print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-Set-Cookie: a=b
-Set-Cookie: c=d
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+Set-Cookie: a=b\r
+Set-Cookie: c=d\r
+\r
 EOF
 
 		}
diff --git a/h2_proxy_request_buffering.t b/h2_proxy_request_buffering.t
index 17fff057..73957a7e 100644
--- a/h2_proxy_request_buffering.t
+++ b/h2_proxy_request_buffering.t
@@ -252,9 +252,9 @@ sub get_body {
 	};
 	$f->{http_end} = sub {
 		$client->write(<<EOF);
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 EOF
 
 		$client->close;
diff --git a/h2_proxy_request_buffering_ssl.t b/h2_proxy_request_buffering_ssl.t
index 288b5fa5..7f920f6f 100644
--- a/h2_proxy_request_buffering_ssl.t
+++ b/h2_proxy_request_buffering_ssl.t
@@ -257,9 +257,9 @@ sub get_body {
 	};
 	$f->{http_end} = sub {
 		$client->write(<<EOF);
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 EOF
 
 		$client->close;
diff --git a/h3_headers.t b/h3_headers.t
index cb1e9ea2..b0955803 100644
--- a/h3_headers.t
+++ b/h3_headers.t
@@ -390,7 +390,7 @@ unlike($s->{headers}, qr/aaaaa/, 'well known chars - huffman encoding');
 # response header field with huffman encoding - complete table mod \0, CR, LF
 # first saturate with short-encoded characters (NB: implementation detail)
 
-my $field = pack "C*", ((map { 97 } (1 .. 862)), 1 .. 9, 11, 12, 14 .. 255);
+my $field = pack "C*", ((map { 97 } (1 .. 862)), 9, 32 .. 126, 128 .. 255);
 
 $s = Test::Nginx::HTTP3->new();
 $sid = $s->new_stream({ headers => [
@@ -907,31 +907,31 @@ sub http_daemon {
 
 		if ($uri eq '/cookie') {
 
-			my ($cookie, $cookie2) = $headers =~ /Cookie: (.+)/ig;
+			my ($cookie, $cookie2) = $headers =~ /^Cookie: ([\t -~]+)\r\n/igm;
 			$cookie2 = '' unless defined $cookie2;
 
 			my ($cookie_a, $cookie_c) = ('', '');
-			$cookie_a = $1 if $headers =~ /X-Cookie-a: (.+)/i;
-			$cookie_c = $1 if $headers =~ /X-Cookie-c: (.+)/i;
+			$cookie_a = $1 if $headers =~ /^X-Cookie-a: ([\t -~]+)\r\n/im;
+			$cookie_c = $1 if $headers =~ /^X-Cookie-c: ([\t -~]+)\r\n/im;
 
 			print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Sent-Cookie: $cookie
-X-Sent-Cookie2: $cookie2
-X-Sent-Cookie-a: $cookie_a
-X-Sent-Cookie-c: $cookie_c
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Sent-Cookie: $cookie\r
+X-Sent-Cookie2: $cookie2\r
+X-Sent-Cookie-a: $cookie_a\r
+X-Sent-Cookie-c: $cookie_c\r
+\r
 EOF
 
 		} elsif ($uri eq '/set-cookie') {
 
 			print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-Set-Cookie: a=b
-Set-Cookie: c=d
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+Set-Cookie: a=b\r
+Set-Cookie: c=d\r
+\r
 EOF
 
 		}
diff --git a/h3_server_name.t b/h3_server_name.t
index 72501698..39dca54a 100644
--- a/h3_server_name.t
+++ b/h3_server_name.t
@@ -98,7 +98,7 @@ is(get3('test.example.com', 'localhost'), 'test', 'http3 - sni not found');
 
 sub get1 {
 	my ($host, $sni) = @_;
-	http("GET / HTTP/1.0\nHost: $host\n\n",
+	http("GET / HTTP/1.0\r\nHost: $host\r\n\r\n",
 		SSL => 1,
 		SSL_hostname => $sni || $host,
 		SSL_alpn_protocols => ['http/1.1'])
diff --git a/http_absolute_redirect.t b/http_absolute_redirect.t
index dac0b2c7..ec02f1b7 100644
--- a/http_absolute_redirect.t
+++ b/http_absolute_redirect.t
@@ -182,9 +182,9 @@ like(get('off', '/auto%20%22%23%25%3C%3E%3F%5C%5E%60%7B%7C%7D'),
 sub get {
 	my ($host, $uri) = @_;
 	http(<<EOF);
-GET $uri HTTP/1.0
-Host: $host
-
+GET $uri HTTP/1.0\r
+Host: $host\r
+\r
 EOF
 }
 
diff --git a/http_disable_symlinks.t b/http_disable_symlinks.t
index 327f1cf5..9aa8413c 100644
--- a/http_disable_symlinks.t
+++ b/http_disable_symlinks.t
@@ -279,9 +279,9 @@ like(http_get('/from/exact/link'), qr!200 OK!, '"from=" exact match');
 sub http_get_host {
 	my ($host, $url) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: $host
-
+GET $url HTTP/1.0\r
+Host: $host\r
+\r
 EOF
 }
 
diff --git a/http_expect_100_continue.t b/http_expect_100_continue.t
index 636b0574..88b9e5f7 100644
--- a/http_expect_100_continue.t
+++ b/http_expect_100_continue.t
@@ -95,12 +95,12 @@ sub http_100_request {
 	my ($url, $version, $value) = @_;
 	$value = '100-continue' unless defined $value;
 	http(<<EOF);
-POST $url HTTP/$version
-Host: localhost
-Expect: $value
-Content-Length: 0
-Connection: close
-
+POST $url HTTP/$version\r
+Host: localhost\r
+Expect: $value\r
+Content-Length: 0\r
+Connection: close\r
+\r
 EOF
 }
 
diff --git a/http_host.t b/http_host.t
index 961e22ac..1ff92724 100644
--- a/http_host.t
+++ b/http_host.t
@@ -177,9 +177,9 @@ like(http_host_header("localhost\x02", 1), qr/ 400 /, 'control');
 sub http_host_header {
 	my ($host, $all) = @_;
 	my ($r) = http(<<EOF);
-GET / HTTP/1.0
-Host: $host
-
+GET / HTTP/1.0\r
+Host: $host\r
+\r
 EOF
 	return ($all ? $r : http_content($r));
 }
@@ -187,9 +187,9 @@ EOF
 sub http_absolute_path {
 	my ($host, $all) = @_;
 	my ($r) = http(<<EOF);
-GET http://$host/ HTTP/1.0
-Host: localhost
-
+GET http://$host/ HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 	return ($all ? $r : http_content($r));
 }
diff --git a/http_include.t b/http_include.t
index 8d36a17b..d515b69c 100644
--- a/http_include.t
+++ b/http_include.t
@@ -93,9 +93,9 @@ unlike(http_get('/'), qr/ 200 /, 'no include');
 sub http_post {
 	my ($uri) = @_;
 	http(<<EOF);
-POST $uri HTTP/1.0
-Host: localhost
-
+POST $uri HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 }
 
diff --git a/http_keepalive.t b/http_keepalive.t
index 4e30db52..5e726850 100644
--- a/http_keepalive.t
+++ b/http_keepalive.t
@@ -134,10 +134,10 @@ like($r, qr/X-Conn: 1:0.*X-Conn: 2:[^0]/s, 'keepalive time limit variables');
 # cancel keepalive on EOF while discarding body
 
 my $s = http(<<EOF, start => 1);
-POST /r HTTP/1.1
-Host: localhost
-Content-Length: 10
-
+POST /r HTTP/1.1\r
+Host: localhost\r
+Content-Length: 10\r
+\r
 EOF
 
 read_keepalive($s);
@@ -175,10 +175,10 @@ sub http_keepalive {
 		my $sleep = ($i == 1 ? $opts{sleep} : 0);
 
 		http(<<EOF, socket => $s, start => 1, sleep => $sleep);
-$opts{method} $url HTTP/1.1
-Host: localhost
-User-Agent: $opts{ua}
-
+$opts{method} $url HTTP/1.1\r
+Host: localhost\r
+User-Agent: $opts{ua}\r
+\r
 EOF
 
 		$total .= read_keepalive($s);
diff --git a/http_keepalive_shutdown.t b/http_keepalive_shutdown.t
index ce5f7091..bb0ce198 100644
--- a/http_keepalive_shutdown.t
+++ b/http_keepalive_shutdown.t
@@ -58,12 +58,12 @@ $t->run();
 # signaling on graceful shutdown to client that keepalive connection is closing
 
 my $s = http(<<EOF, start => 1);
-HEAD /test.html HTTP/1.1
-Host: localhost
-
-HEAD /test.html HTTP/1.1
-Host: localhost
-
+HEAD /test.html HTTP/1.1\r
+Host: localhost\r
+\r
+HEAD /test.html HTTP/1.1\r
+Host: localhost\r
+\r
 EOF
 
 select undef, undef, undef, 0.1;
diff --git a/http_method.t b/http_method.t
index c853a933..3c9c4cf0 100644
--- a/http_method.t
+++ b/http_method.t
@@ -50,23 +50,23 @@ EOF
 ###############################################################################
 
 like(http(<<EOF), qr/405 Not Allowed(?!.*200 OK)/s, 'trace');
-TRACE / HTTP/1.1
-Host: localhost
-
-GET / HTTP/1.1
-Host: localhost
-Connection: close
-
+TRACE / HTTP/1.1\r
+Host: localhost\r
+\r
+GET / HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 like(http(<<EOF), qr/405 Not Allowed(?!.*200 OK)/s, 'connect');
-CONNECT / HTTP/1.1
-Host: localhost
-
-GET / HTTP/1.1
-Host: localhost
-Connection: close
-
+CONNECT / HTTP/1.1\r
+Host: localhost\r
+\r
+GET / HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 ###############################################################################
diff --git a/http_resolver.t b/http_resolver.t
index 975faf4c..5a4b13ae 100644
--- a/http_resolver.t
+++ b/http_resolver.t
@@ -292,18 +292,18 @@ like(http_host_header('tcp2.example.net', '/tcp2'), qr/X-IP: 127.0.0.1/,
 sub http_host_header {
 	my ($host, $uri, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $uri HTTP/1.0
-Host: $host
-
+GET $uri HTTP/1.0\r
+Host: $host\r
+\r
 EOF
 }
 
 sub http_x_name_header {
 	my ($host, $uri) = @_;
 	return http(<<EOF);
-GET $uri HTTP/1.0
-X-Name: $host
-
+GET $uri HTTP/1.0\r
+X-Name: $host\r
+\r
 EOF
 }
 
diff --git a/http_resolver_aaaa.t b/http_resolver_aaaa.t
index 9cfe78d9..86584615 100644
--- a/http_resolver_aaaa.t
+++ b/http_resolver_aaaa.t
@@ -237,9 +237,9 @@ like($response, qr/502 Bad/, 'error error');
 sub http_host_header {
 	my ($host, $uri) = @_;
 	return http(<<EOF);
-GET $uri HTTP/1.0
-Host: $host
-
+GET $uri HTTP/1.0\r
+Host: $host\r
+\r
 EOF
 }
 
diff --git a/http_resolver_cname.t b/http_resolver_cname.t
index 255dcd9b..c6a19a10 100644
--- a/http_resolver_cname.t
+++ b/http_resolver_cname.t
@@ -146,9 +146,9 @@ like(http_host('cn001.example.net', '/short'), qr/502 Bad/, 'recurse uncached');
 sub http_host {
 	my ($host, $uri, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $uri HTTP/1.0
-Host: $host
-
+GET $uri HTTP/1.0\r
+Host: $host\r
+\r
 EOF
 }
 
diff --git a/ignore_invalid_headers.t b/ignore_invalid_headers.t
index 6ee676f2..221f73b1 100644
--- a/ignore_invalid_headers.t
+++ b/ignore_invalid_headers.t
@@ -167,10 +167,10 @@ sub http_daemon {
 		$headers = encode_base64($headers, "");
 
 		print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Headers: $headers
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Headers: $headers\r
+\r
 EOF
 
 	}
diff --git a/image_filter.t b/image_filter.t
index 273230c6..b98791f3 100644
--- a/image_filter.t
+++ b/image_filter.t
@@ -329,9 +329,9 @@ sub http_daemon {
 		my $data = $t->read_file($uri);
 
 		print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 $data
 EOF
 
diff --git a/lib/Test/Nginx.pm b/lib/Test/Nginx.pm
index 7b7bdc57..f19154c2 100644
--- a/lib/Test/Nginx.pm
+++ b/lib/Test/Nginx.pm
@@ -828,18 +828,18 @@ sub log_in {
 sub http_get($;%) {
 	my ($url, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $url HTTP/1.0
-Host: localhost
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 }
 
 sub http_head($;%) {
 	my ($url, %extra) = @_;
 	return http(<<EOF, %extra);
-HEAD $url HTTP/1.0
-Host: localhost
-
+HEAD $url HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 }
 
@@ -937,11 +937,11 @@ sub http_end($;%) {
 sub http_gzip_request {
 	my ($url) = @_;
 	my $r = http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Accept-Encoding: gzip
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Accept-Encoding: gzip\r
+\r
 EOF
 }
 
diff --git a/mirror_proxy.t b/mirror_proxy.t
index f760d9db..7f071b36 100644
--- a/mirror_proxy.t
+++ b/mirror_proxy.t
@@ -115,10 +115,10 @@ sub http_post {
 	my ($url, %extra) = @_;
 
 	http(<<EOF, %extra);
-POST $url HTTP/1.0
-Host: localhost
-Content-Length: 10
-
+POST $url HTTP/1.0\r
+Host: localhost\r
+Content-Length: 10\r
+\r
 1234567890
 EOF
 }
diff --git a/mp4_ssi.t b/mp4_ssi.t
index d41fe372..7c04a88d 100644
--- a/mp4_ssi.t
+++ b/mp4_ssi.t
@@ -73,10 +73,10 @@ unlike($r, qr/\\x0d(\\x0a)?0\\x0d(\\x0a)?\\x0d(\\x0a)?\w/, 'only final chunk');
 sub get {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 }
 
diff --git a/msie_refresh.t b/msie_refresh.t
index 374f8b26..2b0729e6 100644
--- a/msie_refresh.t
+++ b/msie_refresh.t
@@ -85,11 +85,11 @@ unlike(get('/ssi.html'), qr/^0\x0d\x0a?\x0d\x0a?\w/m, 'only final chunk');
 sub get {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-User-Agent: MSIE foo
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+User-Agent: MSIE foo\r
+\r
 EOF
 }
 
diff --git a/not_modified.t b/not_modified.t
index 7deceab6..c103b275 100644
--- a/not_modified.t
+++ b/not_modified.t
@@ -96,30 +96,30 @@ like(http_get_im('/nx', '"foo"'), qr/ 404 /, 'if-match ignored with 404');
 sub http_get_ims {
 	my ($url, $ims) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-If-Modified-Since: $ims
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+If-Modified-Since: $ims\r
+\r
 EOF
 }
 
 sub http_get_inm {
 	my ($url, $inm) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-If-None-Match: $inm
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+If-None-Match: $inm\r
+\r
 EOF
 }
 
 sub http_get_im {
 	my ($url, $inm) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-If-Match: $inm
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+If-Match: $inm\r
+\r
 EOF
 }
 
diff --git a/not_modified_finalize.t b/not_modified_finalize.t
index 306acf2d..edd79f64 100644
--- a/not_modified_finalize.t
+++ b/not_modified_finalize.t
@@ -91,10 +91,10 @@ like(http_match_get('/t.html'), qr//, 'request 412 cached');
 sub http_match_get {
 	my ($url, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $url HTTP/1.0
-Host: localhost
-If-Match: tt
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+If-Match: tt\r
+\r
 EOF
 }
 
diff --git a/not_modified_proxy.t b/not_modified_proxy.t
index 04eb9804..c6ce07ff 100644
--- a/not_modified_proxy.t
+++ b/not_modified_proxy.t
@@ -15,6 +15,7 @@ use warnings;
 use strict;
 
 use Test::More;
+use Data::Dumper;
 
 BEGIN { use FindBin; chdir($FindBin::Bin); }
 
@@ -111,31 +112,58 @@ like(http_get_inm('/cache/etag', $etag), qr/ 304 /, 'inm etag from cache');
 
 sub http_get_ims {
 	my ($url, $ims) = @_;
+        $url =~ /\A[!-~]+\z/ or die "Bad URL \Q$url\E\n";
+        if ($ims =~ /\A[ \t]/) {
+            die "Leading whitespace in \Q$ims\E\n";
+        }
+        if ($ims =~ /[ \t]\r?\z/) {
+            die "Trailing whitespace in \Q$ims\E\n";
+        }
+        unless ($ims =~ /\A([\t -~]+)\r?\z/) {
+            $ims = Dumper($ims);
+            die "Bad If-Modified-Since $ims\n";
+        }
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-If-Modified-Since: $ims
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+If-Modified-Since: $1\r
+\r
 EOF
 }
 
 sub http_get_iums {
 	my ($url, $ims) = @_;
+        $url =~ /\A[!-~]+\z/ or die "Bad URL \Q$url\E\n";
+        if ($ims =~ /\A[ \t]/) {
+            die "Leading whitespace in \Q$ims\E\n";
+        }
+        if ($ims =~ /[ \t]\r?\z/) {
+            die "Leading whitespace in \Q$ims\E\n";
+        }
+        $ims =~ /\A([\t\x20-\x7E]+)\r?\z/ or die "Bad If-Unmodified-Since \Q$ims\E";
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-If-Unmodified-Since: $ims
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+If-Unmodified-Since: $1\r
+\r
 EOF
 }
 
 sub http_get_inm {
 	my ($url, $inm) = @_;
+        $url =~ /\A[!-~]+\z/ or die "Bad URL \Q$url\E\n";
+        if ($inm =~ /\A[ \t]/) {
+            die "Leading whitespace in \Q$inm\E\n";
+        }
+        if ($inm =~ /[ \t]\r?\z/) {
+            die "Leading whitespace in \Q$inm\E\n";
+        }
+        $inm =~ /\A([\t\x20-\x7E]+)\r?\z/ or die "Bad If-None-Match \Q$inm\E\n";
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-If-None-Match: $inm
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+If-None-Match: $1\r
+\r
 EOF
 }
 
diff --git a/proxy.t b/proxy.t
index 324e451d..bc765b6d 100644
--- a/proxy.t
+++ b/proxy.t
@@ -176,10 +176,10 @@ sub get {
 sub http_xff {
 	my ($uri, $xff) = @_;
 	return http(<<EOF);
-GET $uri HTTP/1.0
-Host: localhost
-X-Forwarded-For: $xff
-
+GET $uri HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: $xff\r
+\r
 EOF
 }
 
@@ -209,10 +209,10 @@ sub http_daemon {
 		$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
 
 		if ($uri eq '/') {
-			print $client <<'EOF';
-HTTP/1.1 200 OK
-Connection: close
-
+			print $client <<"EOF";
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 EOF
 			print $client "TEST-OK-IF-YOU-SEE-THIS"
 				unless $headers =~ /^HEAD/i;
@@ -220,9 +220,9 @@ EOF
 		} elsif ($uri eq '/multi') {
 
 			print $client <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 TEST-OK-IF-YOU-SEE-THIS
 EOF
 
@@ -233,9 +233,9 @@ EOF
 			sleep 3;
 
 			print $client <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 EOF
 
 		} elsif ($uri eq '/bad') {
@@ -247,9 +247,9 @@ EOF
 			}
 
 			print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 SEE-THIS-AND-THIS
 EOF
 
@@ -257,18 +257,18 @@ EOF
 			select undef, undef, undef, 1.1;
 
 			print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 SEE-THIS-AND-THIS;
 EOF
 
 		} elsif ($uri eq '/body') {
 
 			print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 SEE-THIS-
 EOF
 
@@ -278,9 +278,9 @@ EOF
 		} else {
 
 			print $client <<"EOF";
-HTTP/1.1 404 Not Found
-Connection: close
-
+HTTP/1.1 404 Not Found\r
+Connection: close\r
+\r
 Oops, '$uri' not found
 EOF
 		}
diff --git a/proxy_available.t b/proxy_available.t
index 6a5b667d..77e3a9bc 100644
--- a/proxy_available.t
+++ b/proxy_available.t
@@ -121,9 +121,9 @@ sub http_daemon {
 		next if $headers eq '';
 
 		my $r = <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 EOF
 
 		$r = $r . 'x' x (512 - length($r));
diff --git a/proxy_cache.t b/proxy_cache.t
index 2c5381a2..7200400d 100644
--- a/proxy_cache.t
+++ b/proxy_cache.t
@@ -118,9 +118,9 @@ like(http_gzip_request('/empty.html'),
 # see 573ec98d2 in nginx for detailed explanation
 
 my $s = http(<<EOF, start => 1);
-HEAD /big.html?e=1 HTTP/1.1
-Host: localhost
-
+HEAD /big.html?e=1 HTTP/1.1\r
+Host: localhost\r
+\r
 EOF
 
 my $r = http_get('/t.html', socket => $s);
@@ -133,11 +133,11 @@ like($r, qr/SEE-THIS/, 'non-cacheable head - second');
 sub http_get_range {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/proxy_cache_chunked.t b/proxy_cache_chunked.t
index 4df0019c..c74d2343 100644
--- a/proxy_cache_chunked.t
+++ b/proxy_cache_chunked.t
@@ -83,12 +83,12 @@ sub http_chunked_daemon {
 			last if (/^\x0d?\x0a?$/);
 		}
 
-		print $client <<'EOF';
-HTTP/1.1 200 OK
-X-Test: SEE-THIS
-Connection: close
-Transfer-Encoding: chunked
-
+		print $client <<"EOF";
+HTTP/1.1 200 OK\r
+X-Test: SEE-THIS\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
 EOF
 		print $client "85" . CRLF;
 		select undef, undef, undef, 0.1;
diff --git a/proxy_cache_lock.t b/proxy_cache_lock.t
index 976a07de..61adfe2a 100644
--- a/proxy_cache_lock.t
+++ b/proxy_cache_lock.t
@@ -152,10 +152,10 @@ sub http_fake_daemon {
 
 		$num++;
 		print $client <<"EOF";
-HTTP/1.1 200 OK
-Cache-Control: max-age=300
-Connection: close
-
+HTTP/1.1 200 OK\r
+Cache-Control: max-age=300\r
+Connection: close\r
+\r
 request $num
 EOF
 	}
diff --git a/proxy_cache_lock_age.t b/proxy_cache_lock_age.t
index 12fe87ae..2370e751 100644
--- a/proxy_cache_lock_age.t
+++ b/proxy_cache_lock_age.t
@@ -132,10 +132,10 @@ sub process_socket {
 	$$num++;
 
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Cache-Control: max-age=300
-Connection: close
-
+HTTP/1.1 200 OK\r
+Cache-Control: max-age=300\r
+Connection: close\r
+\r
 request $$num
 EOF
 
diff --git a/proxy_cache_max_range_offset.t b/proxy_cache_max_range_offset.t
index 666f5ce3..0cb455b6 100644
--- a/proxy_cache_max_range_offset.t
+++ b/proxy_cache_max_range_offset.t
@@ -108,11 +108,11 @@ like(http_get('/t.html'), qr/SEE-THIS/, 'no range - cached');
 sub get {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Range: $extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Range: $extra\r
+\r
 EOF
 }
 
diff --git a/proxy_cache_range.t b/proxy_cache_range.t
index f5400955..afcdf62e 100644
--- a/proxy_cache_range.t
+++ b/proxy_cache_range.t
@@ -110,11 +110,11 @@ like(http_get_range('/tbig.html', 'Range: bytes=0-19'),
 sub http_get_range {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/proxy_cache_use_stale.t b/proxy_cache_use_stale.t
index 294d6431..b9f36dca 100644
--- a/proxy_cache_use_stale.t
+++ b/proxy_cache_use_stale.t
@@ -273,11 +273,11 @@ like(http_get('/escape.html'), qr/MISS/, 'unescaped after escaped');
 sub get {
 	my ($url, $extra, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-X-Cache-Control: $extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+X-Cache-Control: $extra\r
+\r
 EOF
 }
 
diff --git a/proxy_cache_valid.t b/proxy_cache_valid.t
index 3536bc93..9c568bd5 100644
--- a/proxy_cache_valid.t
+++ b/proxy_cache_valid.t
@@ -121,11 +121,11 @@ like(http_get('/'), qr/200 OK/, 'error no-cache - not cacheable');
 sub get {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/proxy_cache_vary.t b/proxy_cache_vary.t
index 88807a6c..df8ac2e7 100644
--- a/proxy_cache_vary.t
+++ b/proxy_cache_vary.t
@@ -306,22 +306,22 @@ like(`grep -F '[crit]' ${\($t->testdir())}/error.log`, qr/^$/s, 'no crit');
 sub get {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Accept-Encoding: $extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Accept-Encoding: $extra\r
+\r
 EOF
 }
 
 sub get1 {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/proxy_chunked.t b/proxy_chunked.t
index 32c7b3c1..75070459 100644
--- a/proxy_chunked.t
+++ b/proxy_chunked.t
@@ -92,16 +92,16 @@ sub http_chunked_daemon {
 			last if (/^\x0d?\x0a?$/);
 		}
 
-		print $client <<'EOF';
-HTTP/1.1 200 OK
-Connection: close
-Transfer-Encoding: chunked
-
-9
+		print $client <<"EOF";
+HTTP/1.1 200 OK\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+9\r
 SEE-THIS
-
-0
-
+\r
+0\r
+\r
 EOF
 
 		close $client;
diff --git a/proxy_extra_data.t b/proxy_extra_data.t
index 4345f133..a86b7f14 100644
--- a/proxy_extra_data.t
+++ b/proxy_extra_data.t
@@ -150,50 +150,50 @@ sub http_daemon {
 		$head = ($headers =~ /^HEAD/);
 
 		if ($uri eq '/') {
-			$c->print("HTTP/1.1 200 OK\n");
-			$c->print("Content-Type: text/html\n");
-			$c->print("Content-Length: 8\n\n");
+			$c->print("HTTP/1.1 200 OK\r\n");
+			$c->print("Content-Type: text/html\r\n");
+			$c->print("Content-Length: 8\r\n\r\n");
 			$c->print("SEE-THIS-BUT-NOT-THIS\n");
 
 		} elsif ($uri eq '/zero') {
-			$c->print("HTTP/1.1 200 OK\n");
-			$c->print("Content-Type: text/html\n");
-			$c->print("Content-Length: 0\n\n");
+			$c->print("HTTP/1.1 200 OK\r\n");
+			$c->print("Content-Type: text/html\r\n");
+			$c->print("Content-Length: 0\r\n\r\n");
 			$c->print("NOT-THIS\n");
 
 		} elsif ($uri eq '/short') {
-			$c->print("HTTP/1.1 200 OK\n");
-			$c->print("Content-Type: text/html\n");
-			$c->print("Content-Length: 100\n\n");
+			$c->print("HTTP/1.1 200 OK\r\n");
+			$c->print("Content-Type: text/html\r\n");
+			$c->print("Content-Length: 100\r\n\r\n");
 			$c->print("SEE-THIS-TOO-SHORT-RESPONSE\n");
 
 		} elsif ($uri eq '/empty') {
-			$c->print("HTTP/1.1 200 OK\n");
-			$c->print("Content-Type: text/html\n");
-			$c->print("Content-Length: 100\n\n");
+			$c->print("HTTP/1.1 200 OK\r\n");
+			$c->print("Content-Type: text/html\r\n");
+			$c->print("Content-Length: 100\r\n\r\n");
 
 		} elsif ($uri eq '/head/empty') {
-			$c->print("HTTP/1.1 200 OK\n");
-			$c->print("Content-Type: text/html\n");
-			$c->print("Content-Length: 8\n\n");
+			$c->print("HTTP/1.1 200 OK\r\n");
+			$c->print("Content-Type: text/html\r\n");
+			$c->print("Content-Length: 8\r\n\r\n");
 			$c->print("SEE-THIS") unless $head;
 
 		} elsif ($uri eq '/head/matching') {
-			$c->print("HTTP/1.1 200 OK\n");
-			$c->print("Content-Type: text/html\n");
-			$c->print("Content-Length: 8\n\n");
+			$c->print("HTTP/1.1 200 OK\r\n");
+			$c->print("Content-Type: text/html\r\n");
+			$c->print("Content-Length: 8\r\n\r\n");
 			$c->print("SEE-THIS");
 
 		} elsif ($uri eq '/head/extra') {
-			$c->print("HTTP/1.1 200 OK\n");
-			$c->print("Content-Type: text/html\n");
-			$c->print("Content-Length: 8\n\n");
+			$c->print("HTTP/1.1 200 OK\r\n");
+			$c->print("Content-Type: text/html\r\n");
+			$c->print("Content-Length: 8\r\n\r\n");
 			$c->print("SEE-THIS-BUT-NOT-THIS\n");
 
 		} elsif ($uri eq '/head/short') {
-			$c->print("HTTP/1.1 200 OK\n");
-			$c->print("Content-Type: text/html\n");
-			$c->print("Content-Length: 100\n\n");
+			$c->print("HTTP/1.1 200 OK\r\n");
+			$c->print("Content-Type: text/html\r\n");
+			$c->print("Content-Length: 100\r\n\r\n");
 			$c->print("SEE-THIS\n");
 		}
 
diff --git a/proxy_force_ranges.t b/proxy_force_ranges.t
index 3453f655..c57fd6e5 100644
--- a/proxy_force_ranges.t
+++ b/proxy_force_ranges.t
@@ -98,13 +98,13 @@ like(http_get_range('/cache/t.html', 'Range: bytes=0-2,4-'), qr/^SEE.*^THIS/ms,
 # If-Range HTTP-date request
 
 like(http_get_range('/proxy/t.html',
-	"Range: bytes=4-\nIf-Range: Mon, 28 Sep 1970 06:00:00 GMT"),
+	"Range: bytes=4-\r\nIf-Range: Mon, 28 Sep 1970 06:00:00 GMT"),
 	qr/^THIS/m, 'if-range last-modified proxy');
 
 # If-Range entity-tag request
 
 like(http_get_range('/proxy/t.html',
-	"Range: bytes=4-\nIf-Range: \"59a5401c-8\""),
+	"Range: bytes=4-\r\nIf-Range: \"59a5401c-8\""),
 	qr/^THIS/m, 'if-range etag proxy');
 
 # range sent using chunked transfer encoding
@@ -117,11 +117,11 @@ like(http_get_range('/proxy/t.html', 'Range: bytes=-2'),
 sub http_get_range {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/proxy_limit_rate.t b/proxy_limit_rate.t
index 5d9ff1b3..261cfbb9 100644
--- a/proxy_limit_rate.t
+++ b/proxy_limit_rate.t
@@ -102,10 +102,10 @@ like(http_get('/keepalive'), qr/200 OK/, 'keepalive 2');
 sub get {
 	my ($uri) = @_;
 	my $r = http(<<EOF);
-GET $uri HTTP/1.1
-Host: localhost
-Connection: close
-
+GET $uri HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 	http_content($r), $r =~ /X-Msec: (\d+)/g;
diff --git a/proxy_limit_rate2.t b/proxy_limit_rate2.t
index b98008a9..be41d77e 100644
--- a/proxy_limit_rate2.t
+++ b/proxy_limit_rate2.t
@@ -79,10 +79,10 @@ is($body, 'X' x 40000, 'response body unlimited');
 sub get {
 	my ($uri) = @_;
 	my $r = http(<<EOF);
-GET $uri HTTP/1.1
-Host: localhost
-Connection: close
-
+GET $uri HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 	http_content($r), $r =~ /X-Msec: (\d+)/g;
diff --git a/proxy_merge_headers.t b/proxy_merge_headers.t
index 7141667a..eefa471f 100644
--- a/proxy_merge_headers.t
+++ b/proxy_merge_headers.t
@@ -122,11 +122,11 @@ unlike(http_get('/passdate/no/'), qr/Server/, 'proxy_pass_header no server');
 sub http_get_ims {
 	my ($url) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-Connection: close
-If-Modified-Since: blah
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+If-Modified-Since: blah\r
+\r
 EOF
 }
 
diff --git a/proxy_next_upstream_tries.t b/proxy_next_upstream_tries.t
index e7b3a031..5e548d65 100644
--- a/proxy_next_upstream_tries.t
+++ b/proxy_next_upstream_tries.t
@@ -178,9 +178,9 @@ sub http_daemon {
 
 		Test::Nginx::log_core('||', "$port: response, 404");
 		print $client <<EOF;
-HTTP/1.1 404 Not Found
-Connection: close
-
+HTTP/1.1 404 Not Found\r
+Connection: close\r
+\r
 EOF
 
 	} continue {
diff --git a/proxy_noclose.t b/proxy_noclose.t
index dd8d2047..4f5c50a0 100644
--- a/proxy_noclose.t
+++ b/proxy_noclose.t
@@ -112,19 +112,19 @@ sub http_noclose_daemon {
 
 		if ($nolen) {
 
-			print $client <<'EOF';
-HTTP/1.1 200 OK
-Connection: close
-
+			print $client <<"EOF";
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 TEST-OK-IF-YOU-SEE-THIS
 EOF
 		} elsif ($multi) {
 
 			print $client <<"EOF";
-HTTP/1.1 200 OK
-Content-Length: 32
-Connection: close
-
+HTTP/1.1 200 OK\r
+Content-Length: 32\r
+Connection: close\r
+\r
 TEST-OK-IF-YOU-SEE-THIS
 EOF
 
@@ -134,10 +134,10 @@ EOF
 		} else {
 
 			print $client <<"EOF";
-HTTP/1.1 200 OK
-Content-Length: 24
-Connection: close
-
+HTTP/1.1 200 OK\r
+Content-Length: 24\r
+Connection: close\r
+\r
 TEST-OK-IF-YOU-SEE-THIS
 EOF
 		}
diff --git a/proxy_non_idempotent.t b/proxy_non_idempotent.t
index 51edc2d1..532a32a8 100644
--- a/proxy_non_idempotent.t
+++ b/proxy_non_idempotent.t
@@ -127,9 +127,9 @@ sub http_post {
 	my $cl = $extra{cl} || 0;
 
 	http(<<"EOF");
-POST $uri HTTP/1.0
-Content-Length: $cl
-
+POST $uri HTTP/1.0\r
+Content-Length: $cl\r
+\r
 EOF
 }
 
diff --git a/proxy_pass_request.t b/proxy_pass_request.t
index d6958934..9eea9a29 100644
--- a/proxy_pass_request.t
+++ b/proxy_pass_request.t
@@ -78,11 +78,11 @@ sub get {
 	my $cl = length("$body\n");
 
 	http(<<EOF);
-GET $uri HTTP/1.0
-Host: localhost
-X-Header: $header
-Content-Length: $cl
-
+GET $uri HTTP/1.0\r
+Host: localhost\r
+X-Header: $header\r
+Content-Length: $cl\r
+\r
 $body
 EOF
 }
@@ -124,11 +124,11 @@ sub http_daemon {
 		my $body = $r =~ /\x0d\x0a?\x0d\x0a?(.+)/ && $1 || 'none';
 
 		print $client <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-X-Header: $header
-X-Body: $body
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Header: $header\r
+X-Body: $body\r
+\r
 EOF
 
 		close $client;
diff --git a/proxy_protocol.t b/proxy_protocol.t
index cbf5e3d6..8581fd71 100644
--- a/proxy_protocol.t
+++ b/proxy_protocol.t
@@ -138,9 +138,9 @@ is($t->read_file('pp6.log'), "2001:db8::1:123\n", 'tcp6 log');
 sub pp_get {
 	my ($url, $proxy) = @_;
 	return http($proxy . <<EOF);
-GET $url HTTP/1.0
-Host: localhost
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 }
 
diff --git a/proxy_protocol2.t b/proxy_protocol2.t
index eb7354b1..fa0911f5 100644
--- a/proxy_protocol2.t
+++ b/proxy_protocol2.t
@@ -145,9 +145,9 @@ is($t->read_file('pp6.log'), "2001:db8::1:123\n", 'tcp6 log');
 sub pp_get {
 	my ($url, $proxy) = @_;
 	return http($proxy . <<EOF);
-GET $url HTTP/1.0
-Host: localhost
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 }
 
diff --git a/proxy_protocol2_tlv.t b/proxy_protocol2_tlv.t
index 735cd2ca..7d0e1aef 100644
--- a/proxy_protocol2_tlv.t
+++ b/proxy_protocol2_tlv.t
@@ -128,9 +128,9 @@ like($r, qr/X-SSL-BINARY: true/, 'SSL_BINARY');
 sub pp_get {
 	my ($url, $proxy) = @_;
 	return http($proxy . <<EOF);
-GET $url HTTP/1.0
-Host: localhost
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 }
 
diff --git a/proxy_request_buffering.t b/proxy_request_buffering.t
index b64a61bd..b7afd204 100644
--- a/proxy_request_buffering.t
+++ b/proxy_request_buffering.t
@@ -187,11 +187,11 @@ sub get_body {
 		or die "Can't create listening socket: $!\n";
 
 	my $r = <<EOF;
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: $length
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: $length\r
+\r
 EOF
 
 	if (defined $body) {
@@ -251,10 +251,10 @@ EOF
 		my $buf = '';
 
 		$client->write(<<EOF);
-HTTP/1.1 200 OK
-Connection: close
-X-Port: $port
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Port: $port\r
+\r
 OK
 EOF
 
diff --git a/proxy_request_buffering_chunked.t b/proxy_request_buffering_chunked.t
index 3cbf7a5f..a1854971 100644
--- a/proxy_request_buffering_chunked.t
+++ b/proxy_request_buffering_chunked.t
@@ -214,11 +214,11 @@ sub get_body {
 		or die "Can't create listening socket: $!\n";
 
 	my $r = <<EOF;
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
 EOF
 
 	if (defined $body) {
@@ -300,10 +300,10 @@ EOF
 		my $buf = '';
 
 		$client->write(<<EOF);
-HTTP/1.1 200 OK
-Connection: close
-X-Port: $port
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Port: $port\r
+\r
 OK
 EOF
 
diff --git a/proxy_request_buffering_keepalive.t b/proxy_request_buffering_keepalive.t
index 7fe47b7d..fb01c50c 100644
--- a/proxy_request_buffering_keepalive.t
+++ b/proxy_request_buffering_keepalive.t
@@ -76,10 +76,10 @@ $t->run();
 # as remain request body.
 
 http(<<EOF);
-GET /t1 HTTP/1.0
-Host: localhost
-Content-Length: 10
-
+GET /t1 HTTP/1.0\r
+Host: localhost\r
+Content-Length: 10\r
+\r
 EOF
 
 like(http_get('/t1'), qr/200 OK.*SEE/ms, 'keepalive after discarded');
diff --git a/proxy_request_buffering_ssl.t b/proxy_request_buffering_ssl.t
index 5fd7f3ca..54712910 100644
--- a/proxy_request_buffering_ssl.t
+++ b/proxy_request_buffering_ssl.t
@@ -208,11 +208,11 @@ sub get_body {
 		or die "Can't create listening socket: $!\n";
 
 	my $r = <<EOF;
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: $length
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: $length\r
+\r
 EOF
 
 	if (defined $body) {
@@ -272,10 +272,10 @@ EOF
 		my $buf = '';
 
 		$client->write(<<EOF);
-HTTP/1.1 200 OK
-Connection: close
-X-Port: $port
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Port: $port\r
+\r
 OK
 EOF
 
diff --git a/proxy_ssl.t b/proxy_ssl.t
index bde77e6b..c9bbcd5c 100644
--- a/proxy_ssl.t
+++ b/proxy_ssl.t
@@ -181,9 +181,9 @@ sub http_daemon {
 			sleep 4;
 
 			print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 EOF
 		}
 
diff --git a/proxy_trailers.t b/proxy_trailers.t
index 7d40ddd1..4136fa15 100644
--- a/proxy_trailers.t
+++ b/proxy_trailers.t
@@ -160,11 +160,11 @@ is($frame->{headers}->{'x-another'}, 'bar', 'h3 trailer 2');
 sub get {
 	my ($uri) = @_;
 	http(<<EOF);
-GET $uri HTTP/1.1
-Host: localhost
-Connection: te, close
-TE: trailers
-
+GET $uri HTTP/1.1\r
+Host: localhost\r
+Connection: te, close\r
+TE: trailers\r
+\r
 EOF
 }
 
diff --git a/proxy_unix.t b/proxy_unix.t
index bf8d4b6f..ff81f3e2 100644
--- a/proxy_unix.t
+++ b/proxy_unix.t
@@ -118,10 +118,10 @@ sub http_daemon {
 		$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
 
 		if (grep { $uri eq $_ } ('/', '/u')) {
-			print $client <<'EOF';
-HTTP/1.1 200 OK
-Connection: close
-
+			print $client <<"EOF";
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 EOF
 			print $client "TEST-OK-IF-YOU-SEE-THIS"
 				unless $headers =~ /^HEAD/i;
@@ -129,9 +129,9 @@ EOF
 		} elsif ($uri eq '/multi') {
 
 			print $client <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 TEST-OK-IF-YOU-SEE-THIS
 EOF
 
@@ -141,9 +141,9 @@ EOF
 		} else {
 
 			print $client <<"EOF";
-HTTP/1.1 404 Not Found
-Connection: close
-
+HTTP/1.1 404 Not Found\r
+Connection: close\r
+\r
 Oops, '$uri' not found
 EOF
 		}
diff --git a/proxy_upstream_cookie.t b/proxy_upstream_cookie.t
index 4ae9bd87..cbbd4a70 100644
--- a/proxy_upstream_cookie.t
+++ b/proxy_upstream_cookie.t
@@ -106,11 +106,11 @@ sub http_get_uc {
 	my ($cookie) = @_;
 
 	http(<<EOF) =~ qr/^X-Upstream-Cookie:\s(.+?)\x0d?$/mi;
-GET / HTTP/1.1
-Host: localhost
-Connection: close
-X-Test-Cookie: $cookie
-
+GET / HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+X-Test-Cookie: $cookie\r
+\r
 EOF
 
 	return $1;
diff --git a/proxy_variables.t b/proxy_variables.t
index f275fd98..1b4a57d7 100644
--- a/proxy_variables.t
+++ b/proxy_variables.t
@@ -71,8 +71,8 @@ $t->stop();
 my $f = $t->read_file('test.log');
 Test::Nginx::log_core('||', $f);
 
-like($f, qr!^/:23:68:$l1:$l1!m, 'log - response length');
-like($f, qr!^/multi:32:77:$l2:$l2!m, 'log - response length - multi packets');
+like($f, qr!^/:23:72:$l1:$l1!m, 'log - response length');
+like($f, qr!^/multi:32:81:$l2:$l2!m, 'log - response length - multi packets');
 
 ###############################################################################
 
@@ -105,10 +105,10 @@ sub http_daemon {
 
 		if ($uri eq '/') {
 			print $client <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-X-Len: $len
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Len: $len\r
+\r
 EOF
 			print $client "TEST-OK-IF-YOU-SEE-THIS"
 				unless $headers =~ /^HEAD/i;
@@ -116,10 +116,10 @@ EOF
 		} elsif ($uri eq '/multi') {
 
 			print $client <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-X-Len: $len
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Len: $len\r
+\r
 TEST-OK-IF-YOU-SEE-THIS
 EOF
 
diff --git a/proxy_xar.t b/proxy_xar.t
index 490eda6a..72e4a6c2 100644
--- a/proxy_xar.t
+++ b/proxy_xar.t
@@ -115,9 +115,9 @@ like(http_get('/proxy?xar=@named'),
 sub http_post {
 	my ($url) = @_;
 	http(<<EOF);
-POST $url HTTP/1.0
-Host: localhost
-
+POST $url HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 }
 
diff --git a/range.t b/range.t
index 1a349cb3..f7d3714a 100644
--- a/range.t
+++ b/range.t
@@ -159,11 +159,11 @@ unlike(http_get_range('/t4.html', 'Range: bytes=0-9'), qr/ 206 /,
 sub http_get_range {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/range_charset.t b/range_charset.t
index 910f4849..3facb2c0 100644
--- a/range_charset.t
+++ b/range_charset.t
@@ -105,11 +105,11 @@ like($t1, qr/Y001YYYYYY\x0d?$/m, 'x-accel-charset - content 10-19');
 sub http_get_range {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/range_clearing.t b/range_clearing.t
index abbd08ad..54c033d8 100644
--- a/range_clearing.t
+++ b/range_clearing.t
@@ -76,11 +76,11 @@ like(http_get_range('/', 'Range: bytes=1000-'),
 sub http_get_range {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/range_flv.t b/range_flv.t
index 86b642f1..26f6485d 100644
--- a/range_flv.t
+++ b/range_flv.t
@@ -81,11 +81,11 @@ like($t1, qr/^FLV.{10}X010XXXXXX(X01[1-7]XXXXXX){7}X018XXX$/m,
 sub http_get_range {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/range_if_range.t b/range_if_range.t
index 5ca75fac..5c1b0b1b 100644
--- a/range_if_range.t
+++ b/range_if_range.t
@@ -65,31 +65,31 @@ my $t1;
 
 # If-Range
 
-$t1 = http_get_range('/t1.html', "Range: bytes=0-9\nIf-Range: wrong");
+$t1 = http_get_range('/t1.html', "Range: bytes=0-9\r\nIf-Range: wrong");
 like($t1, qr/200 OK/, 'if-range wrong');
 like($t1, qr/Last-Modified: /, 'if-range wrong - last modified');
 
-$t1 =~ m/Last-Modified: (.*)/m;
+$t1 =~ m/^Last-Modified: ([ -~]*)\r\n/im;
 my $last = $1;
 
-$t1 = http_get_range('/t1.html', "Range: bytes=0-9\nIf-Range: $last");
+$t1 = http_get_range('/t1.html', "Range: bytes=0-9\r\nIf-Range: $last");
 like($t1, qr/ 206 /, 'if-range');
 
 # If-Range + add_header Last-Modified ""
 
-$t1 = http_get_range('/t2.html', "Range: bytes=0-9\nIf-Range: wrong");
+$t1 = http_get_range('/t2.html', "Range: bytes=0-9\r\nIf-Range: wrong");
 like($t1, qr/200 OK/, 'if-range notime');
 unlike($t1, qr/Last-Modified: /, 'if-range notime - no last modified');
 
 # If-Range + add_header Last-Modified "Mon, 28 Sep 1970 06:00:00 GMT"
 
-$t1 = http_get_range('/t3.html', "Range: bytes=0-9\nIf-Range: wrong");
+$t1 = http_get_range('/t3.html', "Range: bytes=0-9\r\nIf-Range: wrong");
 like($t1, qr/200 OK/, 'if-range time wrong');
 like($t1, qr/Last-Modified: Mon, 28 Sep 1970 06:00:00 GMT/,
 	'if-range time wrong - last modified');
 
 $t1 = http_get_range('/t3.html',
-	"Range: bytes=0-9\nIf-Range: Mon, 28 Sep 1970 06:00:00 GMT");
+	"Range: bytes=0-9\r\nIf-Range: Mon, 28 Sep 1970 06:00:00 GMT");
 like($t1, qr/ 206 /, 'if-range time');
 
 ###############################################################################
@@ -97,11 +97,11 @@ like($t1, qr/ 206 /, 'if-range time');
 sub http_get_range {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/range_mp4.t b/range_mp4.t
index 7c87a616..3dca23ff 100644
--- a/range_mp4.t
+++ b/range_mp4.t
@@ -104,11 +104,11 @@ like($t1, qr/Content-Range: bytes 0-10,11-99\/$fsz/,
 sub http_get_range {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-HEAD $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+HEAD $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/realip.t b/realip.t
index ae964701..66df9b7a 100644
--- a/realip.t
+++ b/realip.t
@@ -83,17 +83,17 @@ $t->plan(8);
 ###############################################################################
 
 like(http(<<EOF), qr/^X-IP: 192.0.2.1/m, 'realip');
-GET / HTTP/1.0
-Host: localhost
-X-Real-IP: 192.0.2.1
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-Real-IP: 192.0.2.1\r
+\r
 EOF
 
 like(http(<<EOF), qr/^X-IP: 192.0.2.1/m, 'realip custom');
-GET /custom HTTP/1.0
-Host: localhost
-X-Real-IP-Custom: 192.0.2.1
-
+GET /custom HTTP/1.0\r
+Host: localhost\r
+X-Real-IP-Custom: 192.0.2.1\r
+\r
 EOF
 
 like(http_xff('/1', '10.0.0.1, 192.0.2.1'), qr/^X-IP: 192.0.2.1/m,
@@ -104,28 +104,28 @@ like(http_xff('/2', '10.0.1.1, 192.0.2.1, 127.0.0.1'),
 	qr/^X-IP: 192.0.2.1/m, 'realip recursive on');
 
 like(http(<<EOF), qr/^X-IP: 10.0.1.1/m, 'realip multi xff recursive off');
-GET /1 HTTP/1.0
-Host: localhost
-X-Forwarded-For: 192.0.2.1
-X-Forwarded-For: 127.0.0.1, 10.0.1.1
-
+GET /1 HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: 192.0.2.1\r
+X-Forwarded-For: 127.0.0.1, 10.0.1.1\r
+\r
 EOF
 
 like(http(<<EOF), qr/^X-IP: 192.0.2.1/m, 'realip multi xff recursive on');
-GET /2 HTTP/1.0
-Host: localhost
-X-Forwarded-For: 10.0.1.1
-X-Forwarded-For: 192.0.2.1
-X-Forwarded-For: 127.0.0.1
-
+GET /2 HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: 10.0.1.1\r
+X-Forwarded-For: 192.0.2.1\r
+X-Forwarded-For: 127.0.0.1\r
+\r
 EOF
 
 my $s = IO::Socket::INET->new('127.0.0.1:' . port(8081));
 like(http(<<EOF, socket => $s), qr/ 204 .*192.0.2.1/s, 'realip post read');
-GET / HTTP/1.0
-Host: localhost
-X-Real-IP: 192.0.2.1
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-Real-IP: 192.0.2.1\r
+\r
 EOF
 
 ###############################################################################
@@ -133,10 +133,10 @@ EOF
 sub http_xff {
 	my ($uri, $xff) = @_;
 	return http(<<EOF);
-GET $uri HTTP/1.0
-Host: localhost
-X-Forwarded-For: $xff
-
+GET $uri HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: $xff\r
+\r
 EOF
 }
 
diff --git a/realip_remote_addr.t b/realip_remote_addr.t
index ef4799b9..ac373b04 100644
--- a/realip_remote_addr.t
+++ b/realip_remote_addr.t
@@ -75,10 +75,10 @@ like(http_xff('/', '192.0.2.1'), qr/X-Real-IP: 127.0.0.1/m, 'realip redirect');
 sub http_xff {
 	my ($uri, $xff) = @_;
 	return http(<<EOF);
-GET $uri HTTP/1.0
-Host: localhost
-X-Forwarded-For: $xff
-
+GET $uri HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: $xff\r
+\r
 EOF
 }
 
diff --git a/realip_remote_port.t b/realip_remote_port.t
index 2d433d5c..0840bdd6 100644
--- a/realip_remote_port.t
+++ b/realip_remote_port.t
@@ -85,10 +85,10 @@ sub http_sp_xff {
 	my ($url, $xff) = @_;
 
 	my $s = http(<<EOF, start => 1);
-GET $url HTTP/1.0
-Host: localhost
-X-Forwarded-For: $xff
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: $xff\r
+\r
 EOF
 
 	return ($s->sockport(), http_end($s));
diff --git a/referer.t b/referer.t
index 177c9491..63077e12 100644
--- a/referer.t
+++ b/referer.t
@@ -195,10 +195,10 @@ sub valid {
 		$text = http_get($uri);
 	} else {
 		$text = http(<<EOF);
-GET $uri HTTP/1.0
-Host: $host
-Referer: $referer
-
+GET $uri HTTP/1.0\r
+Host: $host\r
+Referer: $referer\r
+\r
 EOF
 	}
 
diff --git a/rewrite.t b/rewrite.t
index 31b1a6f6..e735fae2 100644
--- a/rewrite.t
+++ b/rewrite.t
@@ -174,10 +174,10 @@ like(http_get('/error404return405'), qr!HTTP/1.1 405!, 'error 404 return 405');
 # to make problem clear
 
 my $r = http(<<EOF);
-GET /error405return204 HTTP/1.1
-Host: localhost
-Connection: close
-
+GET /error405return204 HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 like($r, qr/HTTP\/1.1 405.*(Content-Length|\x0d\0a0\x0d\x0a)/ms,
diff --git a/rewrite_set.t b/rewrite_set.t
index 8596f1c4..1c6dec72 100644
--- a/rewrite_set.t
+++ b/rewrite_set.t
@@ -89,9 +89,9 @@ like(http_get('/t4.html'), qr/XbarX/, 'set get in return');
 sub http_get_extra {
 	my ($uri, $extra) = @_;
 	return http(<<EOF);
-GET $uri HTTP/1.0
-$extra
-
+GET $uri HTTP/1.0\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/scgi.t b/scgi.t
index 7d66fa3b..6432c75c 100644
--- a/scgi.t
+++ b/scgi.t
@@ -85,18 +85,18 @@ TODO: {
 local $TODO = 'not yet' unless $t->has_version('1.23.0');
 
 my $r = http(<<EOF);
-GET / HTTP/1.0
-Host: localhost
-X-Forwarded-For: foo
-X-Forwarded-For: bar
-X-Forwarded-For: bazz
-Cookie: foo
-Cookie: bar
-Cookie: bazz
-Foo: foo
-Foo: bar
-Foo: bazz
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: foo\r
+X-Forwarded-For: bar\r
+X-Forwarded-For: bazz\r
+Cookie: foo\r
+Cookie: bar\r
+Cookie: bazz\r
+Foo: foo\r
+Foo: bar\r
+Foo: bazz\r
+\r
 EOF
 
 like($r, qr/X-Forwarded-For: foo, bar, bazz/,
@@ -113,28 +113,28 @@ like($r, qr/X-Foo: foo, bar, bazz/,
 sub http_get_headers {
 	my ($url, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $url HTTP/1.0
-Host: localhost
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+\r
 EOF
 }
 
@@ -163,12 +163,12 @@ sub scgi_daemon {
 		my $foo = $request->env->{HTTP_FOO} || '';
 
 		$request->connection()->print(<<EOF);
-Location: http://localhost/redirect
-Content-Type: text/html
-X-Forwarded-For: $xfwd
-X-Cookie: $cookie
-X-Foo: $foo
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+X-Forwarded-For: $xfwd\r
+X-Cookie: $cookie\r
+X-Foo: $foo\r
+\r
 SEE-THIS
 $count
 EOF
diff --git a/scgi_body.t b/scgi_body.t
index 2efeacda..e77dc309 100644
--- a/scgi_body.t
+++ b/scgi_body.t
@@ -63,25 +63,25 @@ like(http_get_length('/', ''), qr/X-Body: /, 'scgi empty body');
 like(http_get_length('/', 'foobar'), qr/X-Body: foobar/, 'scgi body');
 
 like(http(<<EOF), qr/X-Body: foobar/, 'scgi chunked');
-GET / HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
-6
-foobar
-0
-
+GET / HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+6\r
+foobar\r
+0\r
+\r
 EOF
 
 like(http(<<EOF), qr/X-Body: /, 'scgi empty chunked');
-GET / HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
-0
-
+GET / HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+0\r
+\r
 EOF
 
 ###############################################################################
@@ -90,11 +90,11 @@ sub http_get_length {
 	my ($url, $body) = @_;
 	my $length = length $body;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: $length
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: $length\r
+\r
 $body
 EOF
 }
diff --git a/scgi_gzip.t b/scgi_gzip.t
index 60244ab4..993421b4 100644
--- a/scgi_gzip.t
+++ b/scgi_gzip.t
@@ -78,8 +78,8 @@ sub scgi_daemon {
 		next if $@;
 
 		$request->connection()->print(<<EOF);
-Content-Type: text/html
-
+Content-Type: text/html\r
+\r
 SEE-THIS-1234567890-1234567890
 EOF
 	}
diff --git a/scgi_merge_params.t b/scgi_merge_params.t
index efa0e2a7..400a6311 100644
--- a/scgi_merge_params.t
+++ b/scgi_merge_params.t
@@ -101,12 +101,12 @@ like(http_get_ims('/custom/'), qr/blah=custom;/,
 sub http_get_ims {
 	my ($url) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-Connection: close
-If-Modified-Since: blah
-If-Unmodified-Since: blah
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+Connection: close\r
+If-Modified-Since: blah\r
+If-Unmodified-Since: blah\r
+\r
 EOF
 }
 
@@ -132,9 +132,9 @@ sub scgi_daemon {
 		my $blah = $request->env->{HTTP_X_BLAH} || '';
 
 		$request->connection()->print(<<EOF);
-Location: http://localhost/redirect
-Content-Type: text/html
-
+Location: http://localhost/redirect\r
+Content-Type: text/html\r
+\r
 ims=$ims;iums=$iums;blah=$blah;
 EOF
 	}
diff --git a/slice.t b/slice.t
index 40e6f12e..a1649dab 100644
--- a/slice.t
+++ b/slice.t
@@ -266,7 +266,7 @@ like($r, qr/^6789abcdef$/m, 'last bytes - correct content');
 
 # respect not modified and range filters
 
-my ($etag) = http_get('/t') =~ /ETag: (.*)/;
+my ($etag) = http_get('/t') =~ /^ETag: ([ -~]*)\r\n/im;
 
 like(get('/cache/t?inm', "If-None-Match: $etag"), qr/ 304 /, 'inm');
 like(get('/cache/t?inm', "If-None-Match: bad"), qr/ 200 /, 'inm bad');
@@ -274,28 +274,28 @@ like(get('/cache/t?inm', "If-None-Match: bad"), qr/ 200 /, 'inm bad');
 like(get('/cache/t?im', "If-Match: $etag"), qr/ 200 /, 'im');
 like(get('/cache/t?im', "If-Match: bad"), qr/ 412 /, 'im bad');
 
-$r = get('/cache/t?if', "Range: bytes=3-4\nIf-Range: $etag");
+$r = get('/cache/t?if', "Range: bytes=3-4\r\nIf-Range: $etag");
 like($r, qr/ 206 /, 'if-range - 206 partial reply');
 like($r, qr/^34$/m, 'if-range - correct content');
 
 # respect Last-Modified from non-cacheable response with If-Range
 
-my ($lm) = http_get('/t') =~ /Last-Modified: (.*)/;
-$r = get('/proxy/t', "Range: bytes=3-4\nIf-Range: $lm");
+my ($lm) = http_get('/t') =~ /^Last-Modified: ([ -~]*)\r\n/im;
+$r = get('/proxy/t', "Range: bytes=3-4\r\nIf-Range: $lm");
 like($r, qr/ 206 /, 'if-range last-modified proxy - 206 partial reply');
 like($r, qr/^34$/m, 'if-range last-modified proxy - correct content');
 
-$r = get('/cache/t?ifb', "Range: bytes=3-4\nIf-Range: bad");
+$r = get('/cache/t?ifb', "Range: bytes=3-4\r\nIf-Range: bad");
 like($r, qr/ 200 /, 'if-range bad - 200 ok');
 like($r, qr/^0123456789abcdef$/m, 'if-range bad - correct content');
 
 # first slice isn't known
 
-$r = get('/cache/t?skip', "Range: bytes=6-7\nIf-Range: $etag");
+$r = get('/cache/t?skip', "Range: bytes=6-7\r\nIf-Range: $etag");
 like($r, qr/ 206 /, 'if-range skip slice - 206 partial reply');
 like($r, qr/^67$/m, 'if-range skip slice - correct content');
 
-$r = get('/cache/t?skip', "Range: bytes=6-7\nIf-Range: $etag");
+$r = get('/cache/t?skip', "Range: bytes=6-7\r\nIf-Range: $etag");
 like($r, qr/ 206 /, 'if-range skip slice - cached - 206 partial reply');
 like($r, qr/^67$/m, 'if-range skip slice - cached - correct content');
 like($r, qr/HIT/, 'if-range skip bytes - cached - cache status');
@@ -347,11 +347,11 @@ ok(!get('/proxy/bad_range2', ''), 'bad range - unexpected range 2');
 sub get {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
@@ -371,10 +371,10 @@ sub fastcgi_daemon {
 		$stop = $len - 1 if $stop > $len - 1;
 
 		print <<EOF;
-Status: 206
-Content-Type: text/html
-Content-Range: bytes $start-$stop/$len
-
+Status: 206\r
+Content-Type: text/html\r
+Content-Range: bytes $start-$stop/$len\r
+\r
 EOF
 
 		print $body;
diff --git a/ssi_delayed.t b/ssi_delayed.t
index 59360374..b7784fa2 100644
--- a/ssi_delayed.t
+++ b/ssi_delayed.t
@@ -107,9 +107,9 @@ sub http_daemon {
 		select undef, undef, undef, 0.5;
 
 		print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 $data
 EOF
 	}
diff --git a/ssl.t b/ssl.t
index 1d508565..2bf6cc58 100644
--- a/ssl.t
+++ b/ssl.t
@@ -249,9 +249,9 @@ like(get_body('/body', '0123456789', 20, 5), qr/X-Body: (0123456789){100}/,
 
 $s = get_ssl_socket(8085);
 my $req = <<EOF;
-GET / HTTP/1.1
-Host: localhost
-
+GET / HTTP/1.1\r
+Host: localhost\r
+\r
 EOF
 
 $req x= 1000;
diff --git a/ssl_ocsp.t b/ssl_ocsp.t
index 8f6b26d0..5cf5495c 100644
--- a/ssl_ocsp.t
+++ b/ssl_ocsp.t
@@ -429,7 +429,7 @@ sub get_socket {
 	my $port = $extra{port} || 8443;
 
 	return http(
-		"GET /serial HTTP/1.0\nHost: $sni\n\n",
+		"GET /serial HTTP/1.0\r\nHost: $sni\r\n\r\n",
 		start => 1, PeerAddr => '127.0.0.1:' . port($port),
 		SSL => 1,
 		SSL_hostname => $sni,
@@ -506,10 +506,10 @@ sub http_daemon {
 		select undef, undef, undef, 0.02;
 
 		$headers = <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-Content-Type: application/ocsp-response
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+Content-Type: application/ocsp-response\r
+\r
 EOF
 
 		local $/;
diff --git a/ssl_proxy_protocol.t b/ssl_proxy_protocol.t
index 75cfa10b..d7276fc5 100644
--- a/ssl_proxy_protocol.t
+++ b/ssl_proxy_protocol.t
@@ -149,9 +149,9 @@ sub pp_get {
 	my $s = http($proxy, start => 1);
 
 	return http(<<EOF, socket => $s, SSL => 1);
-GET $url HTTP/1.0
-Host: localhost
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 }
 
diff --git a/ssl_reject_handshake.t b/ssl_reject_handshake.t
index b73cc513..93dfb66c 100644
--- a/ssl_reject_handshake.t
+++ b/ssl_reject_handshake.t
@@ -118,7 +118,7 @@ like(get('virtual2', 8082), qr/unrecognized name/, 'virtual 2 rejected');
 sub get {
 	my ($host, $port) = @_;
 	my $r = http(
-		"GET / HTTP/1.0\nHost: " . ($host || 'localhost') . "\n\n",
+		"GET / HTTP/1.0\r\nHost: " . ($host || 'localhost') . "\r\n\r\n",
 		PeerAddr => '127.0.0.1:' . port($port),
 		SSL => 1,
 		SSL_hostname => $host
diff --git a/ssl_sni.t b/ssl_sni.t
index 95e418a0..edbcdf3f 100644
--- a/ssl_sni.t
+++ b/ssl_sni.t
@@ -149,7 +149,7 @@ sub get_cert_cn {
 sub get_host {
 	my ($host, $sni) = @_;
 	return http(
-		"GET / HTTP/1.0\nHost: $host\n\n",
+		"GET / HTTP/1.0\r\nHost: $host\r\n\r\n",
 		SSL => 1,
 		SSL_hostname => $sni || $host
 	);
diff --git a/ssl_sni_sessions.t b/ssl_sni_sessions.t
index fb142566..1e654a63 100644
--- a/ssl_sni_sessions.t
+++ b/ssl_sni_sessions.t
@@ -165,7 +165,7 @@ sub get_ssl_context {
 sub get {
 	my ($host, $port, $ctx) = @_;
 	return http(
-		"GET / HTTP/1.0\nHost: $host\n\n",
+		"GET / HTTP/1.0\r\nHost: $host\r\n\r\n",
 		PeerAddr => '127.0.0.1:' . port($port),
 		SSL => 1,
 		SSL_hostname => $host,
diff --git a/ssl_stapling.t b/ssl_stapling.t
index 1b225ed0..51e36136 100644
--- a/ssl_stapling.t
+++ b/ssl_stapling.t
@@ -388,10 +388,10 @@ sub http_daemon {
 		select undef, undef, undef, 0.02;
 
 		$headers = <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-Content-Type: application/ocsp-response
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+Content-Type: application/ocsp-response\r
+\r
 EOF
 
 		local $/;
diff --git a/stream_limit_conn.t b/stream_limit_conn.t
index 890f27f7..cc13d332 100644
--- a/stream_limit_conn.t
+++ b/stream_limit_conn.t
@@ -92,7 +92,7 @@ like(get(), qr/200 OK/, 'passed');
 # same and other zones
 
 my $s = http(<<EOF, start => 1, sleep => 0.2);
-GET / HTTP/1.0
+GET / HTTP/1.0\r
 EOF
 
 ok($s, 'long connection');
@@ -102,8 +102,8 @@ like(get('127.0.0.1:' . port(8081)), qr/200 OK/, 'passed different zone');
 like(get('127.0.0.1:' . port(8085)), qr/200 OK/, 'passed same zone unlimited');
 
 ok(http(<<EOF, socket => $s), 'long connection closed');
-Host: localhost
-
+Host: localhost\r
+\r
 EOF
 
 # zones proxy chain
diff --git a/stream_limit_conn_complex.t b/stream_limit_conn_complex.t
index edbef3d7..afab2337 100644
--- a/stream_limit_conn_complex.t
+++ b/stream_limit_conn_complex.t
@@ -71,7 +71,7 @@ $t->run()->plan(4);
 like(get(port(8080)), qr/200 OK/, 'passed');
 
 my $s = http(<<EOF, start => 1, sleep => 0.2);
-GET / HTTP/1.0
+GET / HTTP/1.0\r
 EOF
 
 ok($s, 'long connection');
diff --git a/stream_limit_conn_dry_run.t b/stream_limit_conn_dry_run.t
index ca7e5282..02993ded 100644
--- a/stream_limit_conn_dry_run.t
+++ b/stream_limit_conn_dry_run.t
@@ -90,14 +90,14 @@ $t->run()->plan(9);
 
 my ($p, $p1, $p2, $p3) = (port(8080), port(8081), port(8082), port(8083));
 
-is(stream("127.0.0.1:$p")->io("GET /\n"), 'OK', 'passed');
+is(stream("127.0.0.1:$p")->io("GET /\r\n"), 'OK', 'passed');
 
 my $s = stream('127.0.0.1:' . port(8080));
 $s->write("GET");
 
-is(stream("127.0.0.1:$p1")->io("GET /\n"), '', 'rejected');
-is(stream("127.0.0.1:$p2")->io("GET /\n"), 'OK', 'rejected dry run');
-is(stream("127.0.0.1:$p3")->io("GET /\n"), 'OK', 'no limit');
+is(stream("127.0.0.1:$p1")->io("GET /\r\n"), '', 'rejected');
+is(stream("127.0.0.1:$p2")->io("GET /\r\n"), 'OK', 'rejected dry run');
+is(stream("127.0.0.1:$p3")->io("GET /\r\n"), 'OK', 'no limit');
 
 undef $s;
 
diff --git a/stream_ssl.t b/stream_ssl.t
index 787bdfe2..f8a94b47 100644
--- a/stream_ssl.t
+++ b/stream_ssl.t
@@ -171,9 +171,9 @@ sub http_daemon {
 		}
 
 		print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 EOF
 
 		close $client;
diff --git a/stream_ssl_ocsp.t b/stream_ssl_ocsp.t
index 03f4fc2b..93e3cc15 100644
--- a/stream_ssl_ocsp.t
+++ b/stream_ssl_ocsp.t
@@ -513,10 +513,10 @@ sub http_daemon {
 		select undef, undef, undef, 0.02;
 
 		$headers = <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-Content-Type: application/ocsp-response
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+Content-Type: application/ocsp-response\r
+\r
 EOF
 
 		local $/;
diff --git a/stream_ssl_session_reuse.t b/stream_ssl_session_reuse.t
index 9314d7d7..1c348369 100644
--- a/stream_ssl_session_reuse.t
+++ b/stream_ssl_session_reuse.t
@@ -212,9 +212,9 @@ sub http_daemon {
 		}
 
 		print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+\r
 EOF
 
 		close $client;
diff --git a/stream_ssl_stapling.t b/stream_ssl_stapling.t
index 2000ce02..97738af6 100644
--- a/stream_ssl_stapling.t
+++ b/stream_ssl_stapling.t
@@ -388,10 +388,10 @@ sub http_daemon {
 		select undef, undef, undef, 0.02;
 
 		$headers = <<"EOF";
-HTTP/1.1 200 OK
-Connection: close
-Content-Type: application/ocsp-response
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+Content-Type: application/ocsp-response\r
+\r
 EOF
 
 		local $/;
diff --git a/stream_upstream_max_conns.t b/stream_upstream_max_conns.t
index 79da91bb..945e78e2 100644
--- a/stream_upstream_max_conns.t
+++ b/stream_upstream_max_conns.t
@@ -391,9 +391,9 @@ sub process_socket {
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-X-Port: $port
-
+HTTP/1.1 200 OK\r
+X-Port: $port\r
+\r
 OK
 EOF
 
diff --git a/stream_upstream_random.t b/stream_upstream_random.t
index ac59a965..57177070 100644
--- a/stream_upstream_random.t
+++ b/stream_upstream_random.t
@@ -298,10 +298,10 @@ sub http_daemon {
 
 		Test::Nginx::log_core('||', "$port: response, 200");
 		print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Port: $port
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Port: $port\r
+\r
 OK
 EOF
 
diff --git a/stream_upstream_resolve.t b/stream_upstream_resolve.t
index a83e7380..48c1d9f7 100644
--- a/stream_upstream_resolve.t
+++ b/stream_upstream_resolve.t
@@ -174,13 +174,13 @@ sub update_name {
 	$name->{ERROR} = '' unless $name->{ERROR};
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-X-A: $name->{A}
-X-AAAA: $name->{AAAA}
-X-CNAME: $name->{CNAME}
-X-ERROR: $name->{ERROR}
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-A: $name->{A}\r
+X-AAAA: $name->{AAAA}\r
+X-CNAME: $name->{CNAME}\r
+X-ERROR: $name->{ERROR}\r
+\r
 EOF
 
 	my ($gen) = http($req, socket => sock()) =~ /X-Gen: (\d+)/;
@@ -355,21 +355,21 @@ sub process_name {
 	$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
 	return 1 if $uri eq '';
 
-	$headers =~ /X-A: (.*)$/m;
+	$headers =~ /X-A: ([\t -~]*)\r?$/m;
 	map { push @{$h{A}}, $_ } split(/ /, $1);
-	$headers =~ /X-AAAA: (.*)$/m;
+	$headers =~ /X-AAAA: ([\t -~]*)\r?$/m;
 	map { push @{$h{AAAA}}, $_ } split(/ /, $1);
-	$headers =~ /X-CNAME: (.*)$/m;
+	$headers =~ /X-CNAME: ([\t -~]*)\r?$/m;
 	$h{CNAME} = $1;
-	$headers =~ /X-ERROR: (.*)$/m;
+	$headers =~ /X-ERROR: ([\t -~]*)\r?$/m;
 	$h{ERROR} = $1;
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 
diff --git a/stream_upstream_resolve_reload.t b/stream_upstream_resolve_reload.t
index ecdc8349..59b9eb0f 100644
--- a/stream_upstream_resolve_reload.t
+++ b/stream_upstream_resolve_reload.t
@@ -169,11 +169,11 @@ sub update_name {
 	$name->{ERROR} = '' unless $name->{ERROR};
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-X-A: $name->{A}
-X-ERROR: $name->{ERROR}
-
+GET / HTTP/1.1\r
+Host: localhost\r
+X-A: $name->{A}\r
+X-ERROR: $name->{ERROR}\r
+\r
 EOF
 
 	my ($gen) = http($req, socket => sock()) =~ /X-Gen: (\d+)/;
@@ -307,26 +307,29 @@ sub process_name {
 	my $uri = '';
 	my %h;
 
+	die "Bad count\n" unless $cnt =~ /\A[ -~]+\z/;
+
 	while (<$client>) {
 		$headers .= $_;
 		last if (/^\x0d?\x0a?$/);
 	}
 	return 1 if $headers eq '';
 
-	$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
-	return 1 if $uri eq '';
+	$uri = $1 if $headers =~ /\A[A-Z]+ ([!-~\x80-\xFF]+) HTTP\/1\.[01]\r\n/i;
+	die "Bad request line\n" if $uri eq '';
 
-	$headers =~ /X-A: (.*)$/m;
+	$headers =~ /^X-A: ([ -~]*)\r?$/m;
 	map { push @{$h{A}}, $_ } split(/ /, $1);
-	$headers =~ /X-ERROR: (.*)$/m;
+	$headers =~ /^X-ERROR: ([ -~]*)\r?$/m;
 	$h{ERROR} = $1;
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+Content-Length: 3\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 
diff --git a/stream_upstream_resolver.t b/stream_upstream_resolver.t
index 6286066d..60703e90 100644
--- a/stream_upstream_resolver.t
+++ b/stream_upstream_resolver.t
@@ -124,9 +124,9 @@ sub waitfordns {
 	}
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-
+GET / HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 
 	for (1 .. 10) {
@@ -265,10 +265,10 @@ sub control_handler {
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 }
diff --git a/stream_upstream_service.t b/stream_upstream_service.t
index c7c53b42..14403d60 100644
--- a/stream_upstream_service.t
+++ b/stream_upstream_service.t
@@ -301,15 +301,15 @@ sub update_name {
 	$name->{SRV} = '' unless $name->{SRV};
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-X-A: $name->{A}
-X-AAAA: $name->{AAAA}
-X-CNAME: $name->{CNAME}
-X-ERROR: $name->{ERROR}
-X-SERROR: $name->{SERROR}
-X-SRV: $name->{SRV}
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-A: $name->{A}\r
+X-AAAA: $name->{AAAA}\r
+X-CNAME: $name->{CNAME}\r
+X-ERROR: $name->{ERROR}\r
+X-SERROR: $name->{SERROR}\r
+X-SRV: $name->{SRV}\r
+\r
 EOF
 
 	my ($gen) = http($req, socket => sock()) =~ /X-Gen: (\d+)/;
@@ -550,22 +550,22 @@ sub process_name {
 	$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
 	return 1 if $uri eq '';
 
-	$headers =~ /X-A: (.*)$/m;
+	$headers =~ /^X-A: ([\t -~]*)\r?$/im;
 	map { push @{$h{A}}, $_ } split(/ /, $1);
-	$headers =~ /X-AAAA: (.*)$/m;
+	$headers =~ /^X-AAAA: ([\t -~]*)\r?$/im;
 	map { push @{$h{AAAA}}, $_ } split(/ /, $1);
-	$headers =~ /X-SRV: (.*)$/m;
+	$headers =~ /^X-SRV: ([\t -~]*)\r?$/im;
 	map { push @{$h{SRV}}, $_ } split(/;/, $1);
-	$headers =~ /X-CNAME: (.+)$/m and $h{CNAME} = $1;
-	$headers =~ /X-ERROR: (.+)$/m and $h{ERROR} = $1;
-	$headers =~ /X-SERROR: (.+)$/m and $h{SERROR} = $1;
+	$headers =~ /^X-CNAME: ([\t -~]+)\r?$/im and $h{CNAME} = $1;
+	$headers =~ /^X-ERROR: ([\t -~]+)\r?$/im and $h{ERROR} = $1;
+	$headers =~ /^X-SERROR: ([\t -~]+)\r?$/im and $h{SERROR} = $1;
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 
diff --git a/stream_upstream_service_reload.t b/stream_upstream_service_reload.t
index 87b9bead..6a5109cd 100644
--- a/stream_upstream_service_reload.t
+++ b/stream_upstream_service_reload.t
@@ -131,12 +131,12 @@ sub update_name {
 	$name->{SRV} = '' unless $name->{SRV};
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-X-A: $name->{A}
-X-ERROR: $name->{ERROR}
-X-SRV: $name->{SRV}
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-A: $name->{A}\r
+X-ERROR: $name->{ERROR}\r
+X-SRV: $name->{SRV}\r
+\r
 EOF
 
 	my ($gen) = http($req, socket => sock()) =~ /X-Gen: (\d+)/;
@@ -294,19 +294,19 @@ sub process_name {
 	$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
 	return 1 if $uri eq '';
 
-	$headers =~ /X-A: (.*)$/m;
+	$headers =~ /^X-A: ([\t -~]*)\r?$/im;
 	map { push @{$h{A}}, $_ } split(/ /, $1);
-	$headers =~ /X-SRV: (.*)$/m;
+	$headers =~ /^X-SRV: ([\t -~]*)\r?$/im;
 	map { push @{$h{SRV}}, $_ } split(/;/, $1);
-	$headers =~ /X-ERROR: (.*)$/m;
+	$headers =~ /^X-ERROR: ([\t -~]*)\r?$/im;
 	$h{ERROR} = $1;
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 
diff --git a/stub_status.t b/stub_status.t
index b1fa7ddb..20574b1f 100644
--- a/stub_status.t
+++ b/stub_status.t
@@ -74,13 +74,13 @@ is($status{'reading'}, 0, 'not reading');
 # pipelined requests
 
 http(<<EOF);
-GET / HTTP/1.1
-Host: localhost
-
-GET / HTTP/1.1
-Host: localhost
-Connection: close
-
+GET / HTTP/1.1\r
+Host: localhost\r
+\r
+GET / HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 
 %status = status('/stub');
@@ -98,7 +98,7 @@ is($status{'reading'}, 0, 'waiting state - not reading');
 is($status{'writing'}, 1, 'waiting state - not writing');
 
 http(<<EOF, start => 1, socket => $s, sleep => 0.2);
-GET /rate HTTP/1.0
+GET /rate HTTP/1.0\r
 EOF
 
 %status = status('/stub');
@@ -107,8 +107,8 @@ is($status{'reading'}, 1, 'reading state');
 is($status{'writing'}, 1, 'reading state - not writing');
 
 http(<<EOF, start => 1, socket => $s, sleep => 0.2);
-Host: localhost
-
+Host: localhost\r
+\r
 EOF
 
 %status = status('/stub');
@@ -155,9 +155,9 @@ sub get_body {
 sub http_post {
 	my ($url) = @_;
 	return http(<<EOF);
-POST $url HTTP/1.0
-Host: localhost
-
+POST $url HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 }
 
diff --git a/sub_filter_slice.t b/sub_filter_slice.t
index 4f162504..0baa3404 100644
--- a/sub_filter_slice.t
+++ b/sub_filter_slice.t
@@ -92,11 +92,11 @@ is(http_content($r), '34', 'range request - correct content');
 sub get {
 	my ($url, $extra) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-$extra
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+$extra\r
+\r
 EOF
 }
 
diff --git a/trailers.t b/trailers.t
index aa220c4c..b74a9246 100644
--- a/trailers.t
+++ b/trailers.t
@@ -114,20 +114,20 @@ unlike($r, qr/X-Var/, 'inheritance');
 sub get {
 	my ($uri) = @_;
 	http(<<EOF);
-GET $uri HTTP/1.1
-Host: localhost
-Connection: close
-
+GET $uri HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 }
 
 sub head {
 	my ($uri) = @_;
 	http(<<EOF);
-HEAD $uri HTTP/1.1
-Host: localhost
-Connection: close
-
+HEAD $uri HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+\r
 EOF
 }
 
diff --git a/upstream.t b/upstream.t
index 0d27766e..9c704246 100644
--- a/upstream.t
+++ b/upstream.t
@@ -146,10 +146,10 @@ sub http_daemon {
 		}
 
 		print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Port: $port
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Port: $port\r
+\r
 OK
 EOF
 
diff --git a/upstream_least_conn.t b/upstream_least_conn.t
index 4ef5beda..b665cb79 100644
--- a/upstream_least_conn.t
+++ b/upstream_least_conn.t
@@ -127,10 +127,10 @@ sub http_daemon {
 
 		Test::Nginx::log_core('||', "$port: response, 200");
 		print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Port: $port
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Port: $port\r
+\r
 OK
 EOF
 
diff --git a/upstream_max_conns.t b/upstream_max_conns.t
index 5c9318ce..567fd501 100644
--- a/upstream_max_conns.t
+++ b/upstream_max_conns.t
@@ -359,9 +359,9 @@ sub process_socket {
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-X-Port: $port
-
+HTTP/1.1 200 OK\r
+X-Port: $port\r
+\r
 OK
 EOF
 
diff --git a/upstream_random.t b/upstream_random.t
index 67e8ddf3..e7fb5a11 100644
--- a/upstream_random.t
+++ b/upstream_random.t
@@ -253,10 +253,10 @@ sub http_daemon {
 
 		Test::Nginx::log_core('||', "$port: response, 200");
 		print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Port: $port
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Port: $port\r
+\r
 OK
 EOF
 
diff --git a/upstream_resolve.t b/upstream_resolve.t
index 5bc6b7fa..ea954f13 100644
--- a/upstream_resolve.t
+++ b/upstream_resolve.t
@@ -162,13 +162,13 @@ sub update_name {
 	$name->{ERROR} = '' unless $name->{ERROR};
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-X-A: $name->{A}
-X-AAAA: $name->{AAAA}
-X-CNAME: $name->{CNAME}
-X-ERROR: $name->{ERROR}
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-A: $name->{A}\r
+X-AAAA: $name->{AAAA}\r
+X-CNAME: $name->{CNAME}\r
+X-ERROR: $name->{ERROR}\r
+\r
 EOF
 
 	my ($gen) = http($req, socket => sock()) =~ /X-Gen: (\d+)/;
@@ -343,21 +343,21 @@ sub process_name {
 	$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
 	return 1 if $uri eq '';
 
-	$headers =~ /X-A: (.*)$/m;
+	$headers =~ /^X-A: ([\t -~]*)\r?$/im;
 	map { push @{$h{A}}, $_ } split(/ /, $1);
-	$headers =~ /X-AAAA: (.*)$/m;
+	$headers =~ /^X-AAAA: ([\t -~]*)\r$/im;
 	map { push @{$h{AAAA}}, $_ } split(/ /, $1);
-	$headers =~ /X-CNAME: (.*)$/m;
+	$headers =~ /^X-CNAME: ([\t -~]*)\r$/im;
 	$h{CNAME} = $1;
-	$headers =~ /X-ERROR: (.*)$/m;
+	$headers =~ /^X-ERROR: ([\t -~]*)\r$/im;
 	$h{ERROR} = $1;
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 
diff --git a/upstream_resolve_reload.t b/upstream_resolve_reload.t
index 8404c775..b2b39123 100644
--- a/upstream_resolve_reload.t
+++ b/upstream_resolve_reload.t
@@ -139,11 +139,11 @@ sub update_name {
 	$name->{ERROR} = '' unless $name->{ERROR};
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-X-A: $name->{A}
-X-ERROR: $name->{ERROR}
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-A: $name->{A}\r
+X-ERROR: $name->{ERROR}\r
+\r
 EOF
 
 	my ($gen) = http($req, socket => sock()) =~ /X-Gen: (\d+)/;
@@ -286,17 +286,17 @@ sub process_name {
 	$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
 	return 1 if $uri eq '';
 
-	$headers =~ /X-A: (.*)$/m;
+	$headers =~ /^X-A: ([\t -~]*)\r$/im;
 	map { push @{$h{A}}, $_ } split(/ /, $1);
-	$headers =~ /X-ERROR: (.*)$/m;
+	$headers =~ /X-ERROR: ([\t -~]*)\r$/im;
 	$h{ERROR} = $1;
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 
diff --git a/upstream_resolver.t b/upstream_resolver.t
index d60a4e54..8c847d2b 100644
--- a/upstream_resolver.t
+++ b/upstream_resolver.t
@@ -104,9 +104,9 @@ sub waitfordns {
 	}
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-
+GET / HTTP/1.0\r
+Host: localhost\r
+\r
 EOF
 
 	for (1 .. 10) {
@@ -245,10 +245,10 @@ sub control_handler {
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 }
diff --git a/upstream_service.t b/upstream_service.t
index e3aba621..cbb41a5d 100644
--- a/upstream_service.t
+++ b/upstream_service.t
@@ -254,15 +254,15 @@ sub update_name {
 	$name->{SRV} = '' unless $name->{SRV};
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-X-A: $name->{A}
-X-AAAA: $name->{AAAA}
-X-CNAME: $name->{CNAME}
-X-ERROR: $name->{ERROR}
-X-SERROR: $name->{SERROR}
-X-SRV: $name->{SRV}
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-A: $name->{A}\r
+X-AAAA: $name->{AAAA}\r
+X-CNAME: $name->{CNAME}\r
+X-ERROR: $name->{ERROR}\r
+X-SERROR: $name->{SERROR}\r
+X-SRV: $name->{SRV}\r
+\r
 EOF
 
 	my ($gen) = http($req, socket => sock()) =~ /X-Gen: (\d+)/;
@@ -503,22 +503,22 @@ sub process_name {
 	$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
 	return 1 if $uri eq '';
 
-	$headers =~ /X-A: (.*)$/m;
+	$headers =~ /^X-A: ([\t -~]*)\r$/im;
 	map { push @{$h{A}}, $_ } split(/ /, $1);
-	$headers =~ /X-AAAA: (.*)$/m;
+	$headers =~ /^X-AAAA: ([\t -~]*)\r$/im;
 	map { push @{$h{AAAA}}, $_ } split(/ /, $1);
-	$headers =~ /X-SRV: (.*)$/m;
+	$headers =~ /^X-SRV: ([\t -~]*)\r$/im;
 	map { push @{$h{SRV}}, $_ } split(/;/, $1);
-	$headers =~ /X-CNAME: (.+)$/m and $h{CNAME} = $1;
-	$headers =~ /X-ERROR: (.+)$/m and $h{ERROR} = $1;
-	$headers =~ /X-SERROR: (.+)$/m and $h{SERROR} = $1;
+	$headers =~ /^X-CNAME: ([\t -~]+)\r$/im and $h{CNAME} = $1;
+	$headers =~ /^X-ERROR: ([\t -~]+)\r$/im and $h{ERROR} = $1;
+	$headers =~ /^X-SERROR: ([\t -~]+)\r$/im and $h{SERROR} = $1;
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 
diff --git a/upstream_service_reload.t b/upstream_service_reload.t
index bc5a317b..aabe67d4 100644
--- a/upstream_service_reload.t
+++ b/upstream_service_reload.t
@@ -117,12 +117,12 @@ sub update_name {
 	$name->{SRV} = '' unless $name->{SRV};
 
 	my $req =<<EOF;
-GET / HTTP/1.0
-Host: localhost
-X-A: $name->{A}
-X-ERROR: $name->{ERROR}
-X-SRV: $name->{SRV}
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-A: $name->{A}\r
+X-ERROR: $name->{ERROR}\r
+X-SRV: $name->{SRV}\r
+\r
 EOF
 
 	my ($gen) = http($req, socket => sock()) =~ /X-Gen: (\d+)/;
@@ -280,19 +280,19 @@ sub process_name {
 	$uri = $1 if $headers =~ /^\S+\s+([^ ]+)\s+HTTP/i;
 	return 1 if $uri eq '';
 
-	$headers =~ /X-A: (.*)$/m;
+	$headers =~ /^X-A: ([\t -~]*)\r\n/im;
 	map { push @{$h{A}}, $_ } split(/ /, $1);
-	$headers =~ /X-SRV: (.*)$/m;
+	$headers =~ /^X-SRV: ([\t -~]*)\r\n/im;
 	map { push @{$h{SRV}}, $_ } split(/;/, $1);
-	$headers =~ /X-ERROR: (.*)$/m;
+	$headers =~ /^X-ERROR: ([\t -~]*)\r\n/im;
 	$h{ERROR} = $1;
 
 	Test::Nginx::log_core('||', "$port: response, 200");
 	print $client <<EOF;
-HTTP/1.1 200 OK
-Connection: close
-X-Gen: $cnt
-
+HTTP/1.1 200 OK\r
+Connection: close\r
+X-Gen: $cnt\r
+\r
 OK
 EOF
 
diff --git a/userid.t b/userid.t
index 163ba71f..7215dadf 100644
--- a/userid.t
+++ b/userid.t
@@ -272,23 +272,23 @@ sub expires2timegm {
 
 sub uid_set {
 	my ($r) = @_;
-	my ($uid) = $r =~ /X-Set: uid=(.*)\n/m;
+	my ($uid) = $r =~ /^[Xx]-[Ss][Ee][Tt]: uid=([\t -~]*)\r\n/m;
 	return $uid;
 }
 
 sub uid_got {
 	my ($r) = @_;
-	my ($uid) = $r =~ /X-Got: uid=(.*)\n/m;
+	my ($uid) = $r =~ /[Xx]-[Gg][Oo][Tt]: uid=([\t -~]*)\r\n/m;
 	return $uid;
 }
 
 sub send_uid {
 	my ($url, $uid) = @_;
 	return http(<<EOF);
-GET $url HTTP/1.0
-Host: localhost
-Cookie: uid=$uid
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+Cookie: uid=$uid\r
+\r
 EOF
 }
 
diff --git a/uwsgi.t b/uwsgi.t
index 76460130..3c6a646d 100644
--- a/uwsgi.t
+++ b/uwsgi.t
@@ -106,18 +106,18 @@ TODO: {
 local $TODO = 'not yet' unless $t->has_version('1.23.0');
 
 my $r = http(<<EOF);
-GET / HTTP/1.0
-Host: localhost
-X-Forwarded-For: foo
-X-Forwarded-For: bar
-X-Forwarded-For: bazz
-Cookie: foo
-Cookie: bar
-Cookie: bazz
-Foo: foo
-Foo: bar
-Foo: bazz
-
+GET / HTTP/1.0\r
+Host: localhost\r
+X-Forwarded-For: foo\r
+X-Forwarded-For: bar\r
+X-Forwarded-For: bazz\r
+Cookie: foo\r
+Cookie: bar\r
+Cookie: bazz\r
+Foo: foo\r
+Foo: bar\r
+Foo: bazz\r
+\r
 EOF
 
 like($r, qr/X-Forwarded-For: foo, bar, bazz/,
@@ -134,28 +134,28 @@ like($r, qr/X-Foo: foo, bar, bazz/,
 sub http_get_headers {
 	my ($url, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $url HTTP/1.0
-Host: localhost
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+\r
 EOF
 }
 
diff --git a/uwsgi_body.t b/uwsgi_body.t
index d8857c87..37601733 100644
--- a/uwsgi_body.t
+++ b/uwsgi_body.t
@@ -101,11 +101,11 @@ sub http_get_length {
 	my ($url, $body) = @_;
 	my $length = length $body;
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Content-Length: $length
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Content-Length: $length\r
+\r
 $body
 EOF
 }
@@ -114,15 +114,15 @@ sub http_get_chunked {
 	my ($url, $body) = @_;
 	my $length = sprintf("%x", length $body);
 	return http(<<EOF);
-GET $url HTTP/1.1
-Host: localhost
-Connection: close
-Transfer-Encoding: chunked
-
-$length
-$body
-0
-
+GET $url HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Transfer-Encoding: chunked\r
+\r
+$length\r
+$body\r
+0\r
+\r
 EOF
 }
 
diff --git a/uwsgi_ssl.t b/uwsgi_ssl.t
index 7fe2cc25..6f6d9617 100644
--- a/uwsgi_ssl.t
+++ b/uwsgi_ssl.t
@@ -135,28 +135,28 @@ like(http_post_big('/'), qr/SEE-THIS/, 'uwsgi big post');
 sub http_get_headers {
 	my ($url, %extra) = @_;
 	return http(<<EOF, %extra);
-GET $url HTTP/1.0
-Host: localhost
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-X-Blah: ignored header
-
+GET $url HTTP/1.0\r
+Host: localhost\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+X-Blah: ignored header\r
+\r
 EOF
 }
 
diff --git a/worker_shutdown_timeout_proxy_upgrade.t b/worker_shutdown_timeout_proxy_upgrade.t
index 64d1a67a..07ed9dbc 100644
--- a/worker_shutdown_timeout_proxy_upgrade.t
+++ b/worker_shutdown_timeout_proxy_upgrade.t
@@ -59,11 +59,11 @@ $t->run()->waitforsocket('127.0.0.1:' . port(8081));
 ###############################################################################
 
 my $s = http(<<EOF, start => 1);
-GET / HTTP/1.1
-Host: localhost
-Upgrade: foo
-Connection: Upgrade
-
+GET / HTTP/1.1\r
+Host: localhost\r
+Upgrade: foo\r
+Connection: Upgrade\r
+\r
 EOF
 
 my ($sel, $buf) = IO::Select->new($s);
@@ -108,11 +108,11 @@ sub http_daemon {
 
 		next if $headers eq '';
 
-		print $client <<'EOF';
-HTTP/1.1 101 Switching
-Upgrade: foo
-Connection: Upgrade
-
+		print $client <<"EOF";
+HTTP/1.1 101 Switching\r
+Upgrade: foo\r
+Connection: Upgrade\r
+\r
 EOF
 
 	}
diff --git a/xslt.t b/xslt.t
index b3b37d00..da95e7d5 100644
--- a/xslt.t
+++ b/xslt.t
@@ -124,11 +124,11 @@ like(http_get("/x5"), qr!200 OK.*param1=localhost!ms, 'params variable');
 
 unlike(http_get("/x1"), qr!Accept-Ranges!, 'no Accept-Ranges');
 like(http(<<EOF), qr!200 OK.*test xslt result!ms, 'no ranges');
-GET /x1 HTTP/1.1
-Host: localhost
-Connection: close
-Range: bytes=-10
-
+GET /x1 HTTP/1.1\r
+Host: localhost\r
+Connection: close\r
+Range: bytes=-10\r
+\r
 EOF
 
 ###############################################################################