Tests: merge.

body.t

diff --git a/body.t b/body.t
index 37100d3..d406623 100644
--- a/body.t
+++ b/body.t
@@ -122,7 +122,7 @@
 
 # proxy with file only
 
-like(http_get_body('/small', '0123456789'),
+like(http_get_body('/small', '0123456789') || '',
 	qr/X-Body: 0123456789\x0d?$/ms, 'small body in file only');
 
 }

lib/Test/Nginx.pm

diff --git a/lib/Test/Nginx.pm b/lib/Test/Nginx.pm
index 484c314..305ff3c 100644
--- a/lib/Test/Nginx.pm
+++ b/lib/Test/Nginx.pm
@@ -409,7 +409,8 @@
 		my $s = $extra{socket} || IO::Socket::INET->new(
 			Proto => 'tcp',
 			PeerAddr => '127.0.0.1:8080'
-		);
+		)
+			or die "Can't connect to nginx: $!\n";
 		log_out($request);
 		$s->print($request);
 		local $/;

memcached_fake.t

diff --git a/memcached_fake.t b/memcached_fake.t
index d3497df..4227762 100644
--- a/memcached_fake.t
+++ b/memcached_fake.t
@@ -30,6 +30,7 @@
 daemon off;
 
 events {
+use select;
 }
 
 http {