# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1359480851 -14400
# Node ID 85c3b87f2a805710a022190e0022932fd6af59c5
# Parent  0cc5269bc62c8932f2d6eac136dca620c322c5f4# Parent  cca7b57587d6628f8bc32f10ee6c4dc29cbdf90b
Tests: merge.

diff -r cca7b57587d6 -r 85c3b87f2a80 body.t
--- a/body.t	Mon Jan 28 18:36:59 2013 +0400
+++ b/body.t	Tue Jan 29 21:34:11 2013 +0400
@@ -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');
 
 }
diff -r cca7b57587d6 -r 85c3b87f2a80 lib/Test/Nginx.pm
--- a/lib/Test/Nginx.pm	Mon Jan 28 18:36:59 2013 +0400
+++ b/lib/Test/Nginx.pm	Tue Jan 29 21:34:11 2013 +0400
@@ -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 $/;
diff -r cca7b57587d6 -r 85c3b87f2a80 memcached_fake.t
--- a/memcached_fake.t	Mon Jan 28 18:36:59 2013 +0400
+++ b/memcached_fake.t	Tue Jan 29 21:34:11 2013 +0400
@@ -30,6 +30,7 @@
 daemon off;
 
 events {
+use select;
 }
 
 http {